liliana/r-link-uboot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some more printf() format problems.

Browse Source 
Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2008-07-13 19:51:00 +02:00
parent 0f9d5f6d6e
commit d5996dd555
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/cmd_flash.c
View File

@ -342,7 +342,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
puts ("Bad sector specification\n"); puts ("Bad sector specification\n");
return 1; return 1;
} }
printf ("Erase Flash Sectors %d-%d in Bank # %ld ", printf ("Erase Flash Sectors %d-%d in Bank # %d ",
sect_first, sect_last, (info-flash_info)+1); sect_first, sect_last, (info-flash_info)+1);
rcode = flash_erase(info, sect_first, sect_last); rcode = flash_erase(info, sect_first, sect_last);
return rcode; return rcode;
@ -534,7 +534,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
puts ("Bad sector specification\n"); puts ("Bad sector specification\n");
return 1; return 1;
} }
printf("%sProtect Flash Sectors %d-%d in Bank # %ld\n", printf("%sProtect Flash Sectors %d-%d in Bank # %d\n",
p ? "" : "Un-", sect_first, sect_last, p ? "" : "Un-", sect_first, sect_last,
(info-flash_info)+1); (info-flash_info)+1);
for (i = sect_first; i <= sect_last; i++) { for (i = sect_first; i <= sect_last; i++) {

3
common/cmd_nvedit.c
View File

@ -99,7 +99,8 @@ int do_printenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
} }
} }
printf("\nEnvironment size: %d/%ld bytes\n", i, ENV_SIZE); printf("\nEnvironment size: %d/%ld bytes\n",
i, (ulong)ENV_SIZE);
return 0; return 0;
} }

14
drivers/usb/usbdcore.c
View File

@ -546,21 +546,23 @@ void urb_append (urb_link * hd, struct urb *urb)
* *
* NOTE: endpoint_address MUST contain a direction flag. * NOTE: endpoint_address MUST contain a direction flag.
*/ */
struct urb *usbd_alloc_urb (struct usb_device_instance *device, struct usb_endpoint_instance *endpoint) struct urb *usbd_alloc_urb (struct usb_device_instance *device,
struct usb_endpoint_instance *endpoint)
{ {
struct urb *urb; struct urb *urb;
if( !(urb = (struct urb*)malloc(sizeof(struct urb))) ) { if (!(urb = (struct urb *) malloc (sizeof (struct urb)))) {
usberr(" F A T A L: malloc(%lu) FAILED!!!!", sizeof(struct urb)); usberr (" F A T A L: malloc(%u) FAILED!!!!",
sizeof (struct urb));
return NULL; return NULL;
} }
/* Fill in known fields */ /* Fill in known fields */
memset(urb, 0, sizeof(struct urb)); memset (urb, 0, sizeof (struct urb));
urb->endpoint = endpoint; urb->endpoint = endpoint;
urb->device = device; urb->device = device;
urb->buffer = (u8*)urb->buffer_data; urb->buffer = (u8 *) urb->buffer_data;
urb->buffer_length = sizeof(urb->buffer_data); urb->buffer_length = sizeof (urb->buffer_data);
urb_link_init (&urb->link); urb_link_init (&urb->link);

4
fs/jffs2/jffs2_1pass.c
View File

@ -1213,12 +1213,12 @@ 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 != %lu\n", node->totlen, "%d != %u\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 < %lu\n", node->totlen, "%d < %u\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 "