| Message ID | 1462539510-18306-1-git-send-email-m.niestroj@grinn-global.com |
|---|---|
| State | Accepted |
| Commit | 81c878dd3c75c9056e4755ece89f45d056735d75 |
| Delegated to: | Heiko Schocher |
| Headers | show |
ping On 06.05.2016 14:58, Marcin Niestroj wrote: > Format warnings (-Wformat) were shown in printf() calls after defining > DEBUG macro. > > Update format string and explicitly cast variables to suppress all > warnings. > > Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com> > --- > tools/env/fw_env.c | 17 ++++++++++------- > 1 file changed, 10 insertions(+), 7 deletions(-) > > diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c > index 06cf63d..b4b542a 100644 > --- a/tools/env/fw_env.c > +++ b/tools/env/fw_env.c > @@ -649,8 +649,8 @@ static int flash_bad_block (int fd, uint8_t mtd_type, loff_t *blockstart) > > if (badblock) { > #ifdef DEBUG > - fprintf (stderr, "Bad block at 0x%llx, " > - "skipping\n", *blockstart); > + fprintf (stderr, "Bad block at 0x%llx, skipping\n", > + (unsigned long long) *blockstart); > #endif > return badblock; > } > @@ -737,7 +737,8 @@ static int flash_read_buf (int dev, int fd, void *buf, size_t count, > } > #ifdef DEBUG > fprintf(stderr, "Read 0x%x bytes at 0x%llx on %s\n", > - rc, blockstart + block_seek, DEVNAME(dev)); > + rc, (unsigned long long) blockstart + block_seek, > + DEVNAME(dev)); > #endif > processed += readlen; > readlen = min (blocklen, count - processed); > @@ -835,8 +836,9 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, > if (block_seek + count != write_total) { > if (block_seek != 0) > fprintf(stderr, " and "); > - fprintf(stderr, "0x%lx - 0x%x", > - block_seek + count, write_total - 1); > + fprintf(stderr, "0x%lx - 0x%lx", > + (unsigned long) block_seek + count, > + (unsigned long) write_total - 1); > } > fprintf(stderr, "\n"); > #endif > @@ -899,8 +901,9 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, > } > > #ifdef DEBUG > - fprintf(stderr, "Write 0x%x bytes at 0x%llx\n", erasesize, > - blockstart); > + fprintf(stderr, "Write 0x%llx bytes at 0x%llx\n", > + (unsigned long long) erasesize, > + (unsigned long long) blockstart); > #endif > if (write (fd, data + processed, erasesize) != erasesize) { > fprintf (stderr, "Write error on %s: %s\n", >
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 06cf63d..b4b542a 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -649,8 +649,8 @@ static int flash_bad_block (int fd, uint8_t mtd_type, loff_t *blockstart) if (badblock) { #ifdef DEBUG - fprintf (stderr, "Bad block at 0x%llx, " - "skipping\n", *blockstart); + fprintf (stderr, "Bad block at 0x%llx, skipping\n", + (unsigned long long) *blockstart); #endif return badblock; } @@ -737,7 +737,8 @@ static int flash_read_buf (int dev, int fd, void *buf, size_t count, } #ifdef DEBUG fprintf(stderr, "Read 0x%x bytes at 0x%llx on %s\n", - rc, blockstart + block_seek, DEVNAME(dev)); + rc, (unsigned long long) blockstart + block_seek, + DEVNAME(dev)); #endif processed += readlen; readlen = min (blocklen, count - processed); @@ -835,8 +836,9 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, if (block_seek + count != write_total) { if (block_seek != 0) fprintf(stderr, " and "); - fprintf(stderr, "0x%lx - 0x%x", - block_seek + count, write_total - 1); + fprintf(stderr, "0x%lx - 0x%lx", + (unsigned long) block_seek + count, + (unsigned long) write_total - 1); } fprintf(stderr, "\n"); #endif @@ -899,8 +901,9 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, } #ifdef DEBUG - fprintf(stderr, "Write 0x%x bytes at 0x%llx\n", erasesize, - blockstart); + fprintf(stderr, "Write 0x%llx bytes at 0x%llx\n", + (unsigned long long) erasesize, + (unsigned long long) blockstart); #endif if (write (fd, data + processed, erasesize) != erasesize) { fprintf (stderr, "Write error on %s: %s\n",
Format warnings (-Wformat) were shown in printf() calls after defining DEBUG macro. Update format string and explicitly cast variables to suppress all warnings. Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com> --- tools/env/fw_env.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)