Fix printf() format issues with sizeof_t types by using %zu

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/common/lcd.c b/common/lcd.c
index ebf377a..04ef4e3 100644 (file)
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -539,7 +539,7 @@ void bitmap_plot (int x, int y)
 
        debug ("Logo: width %d  height %d  colors %d  cmap %d\n",
                BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, BMP_LOGO_COLORS,
-               sizeof(bmp_logo_palette)/(sizeof(ushort)));
+               (int)(sizeof(bmp_logo_palette)/(sizeof(ushort))));
 
        bmap = &bmp_logo_bitmap[0];
        fb   = (uchar *)(lcd_base + y * lcd_line_length + x);

diff --git a/cpu/mpc8xx/video.c b/cpu/mpc8xx/video.c
index 8bf8e46..ef91165 100644 (file)
--- a/cpu/mpc8xx/video.c
+++ b/cpu/mpc8xx/video.c
@@ -833,10 +833,10 @@ static void video_encoder_init (void)
 
                puts ("[VIDEO ENCODER] Configuring the encoder...\n");
 
-               printf ("Sending %d bytes (@ %08lX) to I2C 0x%X:\n   ",
+               printf ("Sending %zu bytes (@ %08lX) to I2C 0x%lX:\n   ",
                        sizeof(video_encoder_data),
                        (ulong)video_encoder_data,
-                       VIDEO_I2C_ADDR);
+                       (ulong)VIDEO_I2C_ADDR);
                for (i=0; i<sizeof(video_encoder_data); ++i) {
                        printf(" %02X", video_encoder_data[i]);
                }

diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c
index cc2bdac..2bc5c3c 100644 (file)
--- a/drivers/serial/usbtty.c
+++ b/drivers/serial/usbtty.c
@@ -529,8 +529,8 @@ int drv_usbtty_init (void)
        }
        snlen = strlen(sn);
        if (snlen > sizeof(serial_number) - 1) {
-               printf ("Warning: serial number %s is too long (%d > %d)\n",
-                       sn, snlen, sizeof(serial_number) - 1);
+               printf ("Warning: serial number %s is too long (%d > %lu)\n",
+                       sn, snlen, (ulong)(sizeof(serial_number) - 1));
                snlen = sizeof(serial_number) - 1;
        }
        memcpy (serial_number, sn, snlen);

diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c
index 5c1d265..8a06777 100644 (file)
--- a/fs/jffs2/jffs2_1pass.c
+++ b/fs/jffs2/jffs2_1pass.c
@@ -1213,16 +1213,18 @@ jffs2_1pass_build_lists(struct part_info * part)
                        } else if (node->nodetype == JFFS2_NODETYPE_CLEANMARKER) {
                                if (node->totlen != sizeof(struct jffs2_unknown_node))
                                        printf("OOPS Cleanmarker has bad size "
-                                               "%d != %u\n", node->totlen,
+                                               "%d != %zu\n",
+                                               node->totlen,
                                                sizeof(struct jffs2_unknown_node));
                        } else if (node->nodetype == JFFS2_NODETYPE_PADDING) {
                                if (node->totlen < sizeof(struct jffs2_unknown_node))
                                        printf("OOPS Padding has bad size "
-                                               "%d < %u\n", node->totlen,
+                                               "%d < %zu\n",
+                                               node->totlen,
                                                sizeof(struct jffs2_unknown_node));
                        } else {
-                               printf("Unknown node type: %x len %d "
-                                       "offset 0x%x\n", node->nodetype,
+                               printf("Unknown node type: %x len %d offset 0x%x\n",
+                                       node->nodetype,
                                        node->totlen, offset);
                        }
                        offset += ((node->totlen + 3) & ~3);

diff --git a/fs/jffs2/jffs2_nand_1pass.c b/fs/jffs2/jffs2_nand_1pass.c
index d95f551..3ce9c98 100644 (file)
--- a/fs/jffs2/jffs2_nand_1pass.c
+++ b/fs/jffs2/jffs2_nand_1pass.c
@@ -864,16 +864,18 @@ jffs2_1pass_build_lists(struct part_info * part)
                        } else if (node->nodetype == JFFS2_NODETYPE_CLEANMARKER) {
                                if (node->totlen != sizeof(struct jffs2_unknown_node))
                                        printf("OOPS Cleanmarker has bad size "
-                                               "%d != %d\n", node->totlen,
+                                               "%d != %zu\n",
+                                               node->totlen,
                                                sizeof(struct jffs2_unknown_node));
                        } else if (node->nodetype == JFFS2_NODETYPE_PADDING) {
                                if (node->totlen < sizeof(struct jffs2_unknown_node))
                                        printf("OOPS Padding has bad size "
-                                               "%d < %d\n", node->totlen,
+                                               "%d < %zu\n",
+                                               node->totlen,
                                                sizeof(struct jffs2_unknown_node));
                        } else {
-                               printf("Unknown node type: %x len %d "
-                                       "offset 0x%x\n", node->nodetype,
+                               printf("Unknown node type: %x len %d offset 0x%x\n",
+                                       node->nodetype,
                                        node->totlen, offset);
                        }
                        offset += ((node->totlen + 3) & ~3);

diff --git a/lib_m68k/board.c b/lib_m68k/board.c
index d27c89c..a13ea26 100644 (file)
--- a/lib_m68k/board.c
+++ b/lib_m68k/board.c
@@ -347,11 +347,11 @@ board_init_f (ulong bootflag)
        addr_sp -= sizeof (bd_t);
        bd = (bd_t *) addr_sp;
        gd->bd = bd;
-       debug ("Reserving %d Bytes for Board Info at: %08lx\n",
+       debug ("Reserving %zu Bytes for Board Info at: %08lx\n",
                        sizeof (bd_t), addr_sp);
        addr_sp -= sizeof (gd_t);
        id = (gd_t *) addr_sp;
-       debug ("Reserving %d Bytes for Global Data at: %08lx\n",
+       debug ("Reserving %zu Bytes for Global Data at: %08lx\n",
                        sizeof (gd_t), addr_sp);
 
        /* Reserve memory for boot params. */

diff --git a/lib_mips/board.c b/lib_mips/board.c
index 532550b..09b8b3b 100644 (file)
--- a/lib_mips/board.c
+++ b/lib_mips/board.c
@@ -242,12 +242,12 @@ void board_init_f(ulong bootflag)
        addr_sp -= sizeof(bd_t);
        bd = (bd_t *)addr_sp;
        gd->bd = bd;
-       debug ("Reserving %d Bytes for Board Info at: %08lx\n",
+       debug ("Reserving %zu Bytes for Board Info at: %08lx\n",
                        sizeof(bd_t), addr_sp);
 
        addr_sp -= sizeof(gd_t);
        id = (gd_t *)addr_sp;
-       debug ("Reserving %d Bytes for Global Data at: %08lx\n",
+       debug ("Reserving %zu Bytes for Global Data at: %08lx\n",
                        sizeof (gd_t), addr_sp);
 
        /* Reserve memory for boot params.

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 1bc2f46..71a70db 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -524,11 +524,11 @@ void board_init_f (ulong bootflag)
        addr_sp -= sizeof (bd_t);
        bd = (bd_t *) addr_sp;
        gd->bd = bd;
-       debug ("Reserving %d Bytes for Board Info at: %08lx\n",
+       debug ("Reserving %zu Bytes for Board Info at: %08lx\n",
                        sizeof (bd_t), addr_sp);
        addr_sp -= sizeof (gd_t);
        id = (gd_t *) addr_sp;
-       debug ("Reserving %d Bytes for Global Data at: %08lx\n",
+       debug ("Reserving %zu Bytes for Global Data at: %08lx\n",
                        sizeof (gd_t), addr_sp);
 
        /*

diff --git a/net/bootp.c b/net/bootp.c
index 3c0614c..f48744a 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -313,7 +313,7 @@ BootpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
        Bootp_t *bp;
        char    *s;
 
-       debug ("got BOOTP packet (src=%d, dst=%d, len=%d want_len=%d)\n",
+       debug ("got BOOTP packet (src=%d, dst=%d, len=%d want_len=%zu)\n",
                src, dest, len, sizeof (Bootp_t));
 
        bp = (Bootp_t *)pkt;