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>
This commit is contained in:
Wolfgang Denk 2008-07-14 15:06:35 +02:00
parent f354b73e16
commit b64f190b7a
9 changed files with 24 additions and 20 deletions

View File

@ -539,7 +539,7 @@ void bitmap_plot (int x, int y)
debug ("Logo: width %d height %d colors %d cmap %d\n", debug ("Logo: width %d height %d colors %d cmap %d\n",
BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, BMP_LOGO_COLORS, 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]; bmap = &bmp_logo_bitmap[0];
fb = (uchar *)(lcd_base + y * lcd_line_length + x); fb = (uchar *)(lcd_base + y * lcd_line_length + x);

View File

@ -833,10 +833,10 @@ static void video_encoder_init (void)
puts ("[VIDEO ENCODER] Configuring the encoder...\n"); 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), sizeof(video_encoder_data),
(ulong)video_encoder_data, (ulong)video_encoder_data,
VIDEO_I2C_ADDR); (ulong)VIDEO_I2C_ADDR);
for (i=0; i<sizeof(video_encoder_data); ++i) { for (i=0; i<sizeof(video_encoder_data); ++i) {
printf(" %02X", video_encoder_data[i]); printf(" %02X", video_encoder_data[i]);
} }

View File

@ -529,8 +529,8 @@ int drv_usbtty_init (void)
} }
snlen = strlen(sn); snlen = strlen(sn);
if (snlen > sizeof(serial_number) - 1) { if (snlen > sizeof(serial_number) - 1) {
printf ("Warning: serial number %s is too long (%d > %d)\n", printf ("Warning: serial number %s is too long (%d > %lu)\n",
sn, snlen, sizeof(serial_number) - 1); sn, snlen, (ulong)(sizeof(serial_number) - 1));
snlen = sizeof(serial_number) - 1; snlen = sizeof(serial_number) - 1;
} }
memcpy (serial_number, sn, snlen); memcpy (serial_number, sn, snlen);

View File

@ -1213,16 +1213,18 @@ jffs2_1pass_build_lists(struct part_info * part)
} else if (node->nodetype == JFFS2_NODETYPE_CLEANMARKER) { } else if (node->nodetype == JFFS2_NODETYPE_CLEANMARKER) {
if (node->totlen != sizeof(struct jffs2_unknown_node)) if (node->totlen != sizeof(struct jffs2_unknown_node))
printf("OOPS Cleanmarker has bad size " printf("OOPS Cleanmarker has bad size "
"%d != %u\n", node->totlen, "%d != %zu\n",
node->totlen,
sizeof(struct jffs2_unknown_node)); sizeof(struct jffs2_unknown_node));
} else if (node->nodetype == JFFS2_NODETYPE_PADDING) { } else if (node->nodetype == JFFS2_NODETYPE_PADDING) {
if (node->totlen < sizeof(struct jffs2_unknown_node)) if (node->totlen < sizeof(struct jffs2_unknown_node))
printf("OOPS Padding has bad size " printf("OOPS Padding has bad size "
"%d < %u\n", node->totlen, "%d < %zu\n",
node->totlen,
sizeof(struct jffs2_unknown_node)); sizeof(struct jffs2_unknown_node));
} else { } else {
printf("Unknown node type: %x len %d " printf("Unknown node type: %x len %d offset 0x%x\n",
"offset 0x%x\n", node->nodetype, node->nodetype,
node->totlen, offset); node->totlen, offset);
} }
offset += ((node->totlen + 3) & ~3); offset += ((node->totlen + 3) & ~3);

View File

@ -864,16 +864,18 @@ jffs2_1pass_build_lists(struct part_info * part)
} else if (node->nodetype == JFFS2_NODETYPE_CLEANMARKER) { } else if (node->nodetype == JFFS2_NODETYPE_CLEANMARKER) {
if (node->totlen != sizeof(struct jffs2_unknown_node)) if (node->totlen != sizeof(struct jffs2_unknown_node))
printf("OOPS Cleanmarker has bad size " printf("OOPS Cleanmarker has bad size "
"%d != %d\n", node->totlen, "%d != %zu\n",
node->totlen,
sizeof(struct jffs2_unknown_node)); sizeof(struct jffs2_unknown_node));
} else if (node->nodetype == JFFS2_NODETYPE_PADDING) { } else if (node->nodetype == JFFS2_NODETYPE_PADDING) {
if (node->totlen < sizeof(struct jffs2_unknown_node)) if (node->totlen < sizeof(struct jffs2_unknown_node))
printf("OOPS Padding has bad size " printf("OOPS Padding has bad size "
"%d < %d\n", node->totlen, "%d < %zu\n",
node->totlen,
sizeof(struct jffs2_unknown_node)); sizeof(struct jffs2_unknown_node));
} else { } else {
printf("Unknown node type: %x len %d " printf("Unknown node type: %x len %d offset 0x%x\n",
"offset 0x%x\n", node->nodetype, node->nodetype,
node->totlen, offset); node->totlen, offset);
} }
offset += ((node->totlen + 3) & ~3); offset += ((node->totlen + 3) & ~3);

View File

@ -347,11 +347,11 @@ board_init_f (ulong bootflag)
addr_sp -= sizeof (bd_t); addr_sp -= sizeof (bd_t);
bd = (bd_t *) addr_sp; bd = (bd_t *) addr_sp;
gd->bd = bd; 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); sizeof (bd_t), addr_sp);
addr_sp -= sizeof (gd_t); addr_sp -= sizeof (gd_t);
id = (gd_t *) addr_sp; 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); sizeof (gd_t), addr_sp);
/* Reserve memory for boot params. */ /* Reserve memory for boot params. */

View File

@ -242,12 +242,12 @@ void board_init_f(ulong bootflag)
addr_sp -= sizeof(bd_t); addr_sp -= sizeof(bd_t);
bd = (bd_t *)addr_sp; bd = (bd_t *)addr_sp;
gd->bd = bd; 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); sizeof(bd_t), addr_sp);
addr_sp -= sizeof(gd_t); addr_sp -= sizeof(gd_t);
id = (gd_t *)addr_sp; 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); sizeof (gd_t), addr_sp);
/* Reserve memory for boot params. /* Reserve memory for boot params.

View File

@ -524,11 +524,11 @@ void board_init_f (ulong bootflag)
addr_sp -= sizeof (bd_t); addr_sp -= sizeof (bd_t);
bd = (bd_t *) addr_sp; bd = (bd_t *) addr_sp;
gd->bd = bd; 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); sizeof (bd_t), addr_sp);
addr_sp -= sizeof (gd_t); addr_sp -= sizeof (gd_t);
id = (gd_t *) addr_sp; 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); sizeof (gd_t), addr_sp);
/* /*

View File

@ -313,7 +313,7 @@ BootpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
Bootp_t *bp; Bootp_t *bp;
char *s; 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)); src, dest, len, sizeof (Bootp_t));
bp = (Bootp_t *)pkt; bp = (Bootp_t *)pkt;