Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32183
Change subject: libpayload: Align main() data types ......................................................................
libpayload: Align main() data types
One of many steps to compile with -Wconversion, as unsigned int and int aren't the same thing.
BUG=b:111443775 BRANCH=none TEST=make junit.xml shows fewer warnings with -Wconversion enabled
Change-Id: I9673ca70da32a1e5117b27fa89167e03379af9c1 Signed-off-by: Patrick Georgi pgeorgi@google.com --- M payloads/libpayload/arch/arm/main.c M payloads/libpayload/arch/arm64/main.c M payloads/libpayload/arch/mips/main.c M payloads/libpayload/arch/x86/main.c 4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/32183/1
diff --git a/payloads/libpayload/arch/arm/main.c b/payloads/libpayload/arch/arm/main.c index cb2d242..52c6162 100644 --- a/payloads/libpayload/arch/arm/main.c +++ b/payloads/libpayload/arch/arm/main.c @@ -30,7 +30,7 @@ #include <exception.h> #include <libpayload.h>
-unsigned int main_argc; /**< The argc value to pass to main() */ +int main_argc; /**< The argc value to pass to main() */
/** The argv value to pass to main() */ char *main_argv[MAX_ARGC_COUNT]; diff --git a/payloads/libpayload/arch/arm64/main.c b/payloads/libpayload/arch/arm64/main.c index 593c40e..9a9ae96 100644 --- a/payloads/libpayload/arch/arm64/main.c +++ b/payloads/libpayload/arch/arm64/main.c @@ -31,7 +31,7 @@ #include <libpayload.h> #include <arch/mmu.h>
-unsigned int main_argc; /**< The argc value to pass to main() */ +int main_argc; /**< The argc value to pass to main() */
/** The argv value to pass to main() */ char *main_argv[MAX_ARGC_COUNT]; diff --git a/payloads/libpayload/arch/mips/main.c b/payloads/libpayload/arch/mips/main.c index b8c0c4d..7a71f90 100644 --- a/payloads/libpayload/arch/mips/main.c +++ b/payloads/libpayload/arch/mips/main.c @@ -17,7 +17,7 @@ #include <libpayload.h>
/* The argc value to pass to main() */ -unsigned int main_argc; +int main_argc; /* The argv value to pass to main() */ char *main_argv[MAX_ARGC_COUNT];
diff --git a/payloads/libpayload/arch/x86/main.c b/payloads/libpayload/arch/x86/main.c index 4da0bba..2e876f2 100644 --- a/payloads/libpayload/arch/x86/main.c +++ b/payloads/libpayload/arch/x86/main.c @@ -34,7 +34,7 @@ unsigned long loader_eax; /**< The value of EAX passed from the loader */ unsigned long loader_ebx; /**< The value of EBX passed from the loader */
-unsigned int main_argc; /**< The argc value to pass to main() */ +int main_argc; /**< The argc value to pass to main() */
/** The argv value to pass to main() */ char *main_argv[MAX_ARGC_COUNT];
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32183 )
Change subject: libpayload: Align main() data types ......................................................................
Patch Set 1: Code-Review+2
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32183 )
Change subject: libpayload: Align main() data types ......................................................................
libpayload: Align main() data types
One of many steps to compile with -Wconversion, as unsigned int and int aren't the same thing.
BUG=b:111443775 BRANCH=none TEST=make junit.xml shows fewer warnings with -Wconversion enabled
Change-Id: I9673ca70da32a1e5117b27fa89167e03379af9c1 Signed-off-by: Patrick Georgi pgeorgi@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/32183 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Patrick Rudolph siro@das-labor.org --- M payloads/libpayload/arch/arm/main.c M payloads/libpayload/arch/arm64/main.c M payloads/libpayload/arch/mips/main.c M payloads/libpayload/arch/x86/main.c 4 files changed, 4 insertions(+), 4 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Rudolph: Looks good to me, approved
diff --git a/payloads/libpayload/arch/arm/main.c b/payloads/libpayload/arch/arm/main.c index cb2d242..52c6162 100644 --- a/payloads/libpayload/arch/arm/main.c +++ b/payloads/libpayload/arch/arm/main.c @@ -30,7 +30,7 @@ #include <exception.h> #include <libpayload.h>
-unsigned int main_argc; /**< The argc value to pass to main() */ +int main_argc; /**< The argc value to pass to main() */
/** The argv value to pass to main() */ char *main_argv[MAX_ARGC_COUNT]; diff --git a/payloads/libpayload/arch/arm64/main.c b/payloads/libpayload/arch/arm64/main.c index 593c40e..9a9ae96 100644 --- a/payloads/libpayload/arch/arm64/main.c +++ b/payloads/libpayload/arch/arm64/main.c @@ -31,7 +31,7 @@ #include <libpayload.h> #include <arch/mmu.h>
-unsigned int main_argc; /**< The argc value to pass to main() */ +int main_argc; /**< The argc value to pass to main() */
/** The argv value to pass to main() */ char *main_argv[MAX_ARGC_COUNT]; diff --git a/payloads/libpayload/arch/mips/main.c b/payloads/libpayload/arch/mips/main.c index b8c0c4d..7a71f90 100644 --- a/payloads/libpayload/arch/mips/main.c +++ b/payloads/libpayload/arch/mips/main.c @@ -17,7 +17,7 @@ #include <libpayload.h>
/* The argc value to pass to main() */ -unsigned int main_argc; +int main_argc; /* The argv value to pass to main() */ char *main_argv[MAX_ARGC_COUNT];
diff --git a/payloads/libpayload/arch/x86/main.c b/payloads/libpayload/arch/x86/main.c index 4da0bba..2e876f2 100644 --- a/payloads/libpayload/arch/x86/main.c +++ b/payloads/libpayload/arch/x86/main.c @@ -34,7 +34,7 @@ unsigned long loader_eax; /**< The value of EAX passed from the loader */ unsigned long loader_ebx; /**< The value of EBX passed from the loader */
-unsigned int main_argc; /**< The argc value to pass to main() */ +int main_argc; /**< The argc value to pass to main() */
/** The argv value to pass to main() */ char *main_argv[MAX_ARGC_COUNT];
-
Patrick Georgi (Code Review) -
Patrick Rudolph (Code Review)