diff mbox

[U-Boot,v2] mkenvimage: Fix compiler warning

Message ID 1333703707-10193-1-git-send-email-dirk.behme@gmail.com
State Accepted
Commit 1ebff63fb9f4331459f2278c8f15963e312a1b1e
Delegated to: Anatolij Gustschin
Headers show

Commit Message

Dirk Behme April 6, 2012, 9:15 a.m. UTC
From: Dirk Behme <dirk.behme@googlemail.com>

Fix the compiler warning

mkenvimage.c: In function ‘main’:
mkenvimage.c:218: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’
mkenvimage.c:226: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’

introduced with the commit

mkenvimage: Use mmap() when reading from a regular file
6ee39f8055680654f9cc97b98dcce9588f1ab71e

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
CC: David Wagner <david.wagner@free-electrons.com>
CC: Anatolij Gustschin <agust@denx.de>
CC: Mike Frysinger <vapier@gentoo.org>
---
Changes in v2: Use size_t formatter '%zu'.

 tools/mkenvimage.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Comments

Mike Frysinger April 6, 2012, 3:14 p.m. UTC | #1
On Friday 06 April 2012 05:15:07 Dirk Behme wrote:
> -			fprintf(stderr, "mmap (%ld bytes) failed: %s\n",
> +			fprintf(stderr, "mmap (%zu bytes) failed: %s\n",

i was just about to point this out in your v1 patch :)

Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
David Wagner April 6, 2012, 6:48 p.m. UTC | #2
On 06/04/2012 11:15, Dirk Behme wrote:
> From: Dirk Behme <dirk.behme@googlemail.com>
> 
> Fix the compiler warning
> 
> mkenvimage.c: In function ‘main’:
> mkenvimage.c:218: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’
> mkenvimage.c:226: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’
> 

I don't have these warnings ... I guess it is because we don't have the
same compiler ?  Thank you, I didn't know the %zu format :)

Acked-by: David Wagner <deubeuliou@gmail.com>

	Cheers,
	David.
Anatolij Gustschin April 10, 2012, 9:55 p.m. UTC | #3
On Fri,  6 Apr 2012 11:15:07 +0200
Dirk Behme <dirk.behme@googlemail.com> wrote:

> From: Dirk Behme <dirk.behme@googlemail.com>
> 
> Fix the compiler warning
> 
> mkenvimage.c: In function ‘main’:
> mkenvimage.c:218: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’
> mkenvimage.c:226: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’
> 
> introduced with the commit
> 
> mkenvimage: Use mmap() when reading from a regular file
> 6ee39f8055680654f9cc97b98dcce9588f1ab71e
> 
> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
> CC: David Wagner <david.wagner@free-electrons.com>
> CC: Anatolij Gustschin <agust@denx.de>
> CC: Mike Frysinger <vapier@gentoo.org>
> ---
> Changes in v2: Use size_t formatter '%zu'.
> 
>  tools/mkenvimage.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

GCC 4.6.1 and GCC 4.2.2 didn't warn here. But I've applied this patch since
it fixes warnings for you. Thanks!

Applied to u-boot-staging/agust@denx.de.

Thanks,
Anatolij
diff mbox

Patch

diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c
index 9dbb3b2..bfc4eb6 100644
--- a/tools/mkenvimage.c
+++ b/tools/mkenvimage.c
@@ -213,7 +213,7 @@  int main(int argc, char **argv)
 		filebuf = mmap(NULL, sizeof(*envptr) * filesize, PROT_READ,
 			       MAP_PRIVATE, txt_fd, 0);
 		if (filebuf == MAP_FAILED) {
-			fprintf(stderr, "mmap (%ld bytes) failed: %s\n",
+			fprintf(stderr, "mmap (%zu bytes) failed: %s\n",
 					sizeof(*envptr) * filesize,
 					strerror(errno));
 			fprintf(stderr, "Falling back to read()\n");
@@ -221,7 +221,7 @@  int main(int argc, char **argv)
 			filebuf = malloc(sizeof(*envptr) * filesize);
 			ret = read(txt_fd, filebuf, sizeof(*envptr) * filesize);
 			if (ret != sizeof(*envptr) * filesize) {
-				fprintf(stderr, "Can't read the whole input file (%ld bytes): %s\n",
+				fprintf(stderr, "Can't read the whole input file (%zu bytes): %s\n",
 					sizeof(*envptr) * filesize,
 					strerror(errno));