vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* include/grub/types.h: Define the C99-style PRIxGRUB_SIZE macro,

Browse source 
suitable for using within the format argument of printf when
converting grub_size_t.
* disk/usbms.c (grub_usbms_transfer): Use PRIxGRUB_SIZE rather than
"x" to convert grub_size_t arguments.
This commit is contained in:
Colin Watson 2010-07-02 18:04:54 +01:00
parent 4037210375
commit 50f0bcdab5
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2010-07-02 Colin Watson <cjwatson@ubuntu.com>
* include/grub/types.h: Define the C99-style PRIxGRUB_SIZE macro,
suitable for using within the format argument of printf when
converting grub_size_t.
* disk/usbms.c (grub_usbms_transfer): Use PRIxGRUB_SIZE rather than
"x" to convert grub_size_t arguments.
2010-07-02 Vladimir Serbinenko <phcoder@gmail.com> 2010-07-02 Vladimir Serbinenko <phcoder@gmail.com>
* gfxmenu/gui_list.c (draw_menu): Use viewport to simplify code and fix * gfxmenu/gui_list.c (draw_menu): Use viewport to simplify code and fix

4
disk/usbms.c
View file

@ -312,7 +312,7 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
grub_dprintf ("usb", "buf:\n"); grub_dprintf ("usb", "buf:\n");
if (size <= 64) if (size <= 64)
for (i=0; i<size; i++) for (i=0; i<size; i++)
grub_dprintf ("usb", "0x%02x: 0x%02x\n", i, buf[i]); grub_dprintf ("usb", "0x%02" PRIxGRUB_SIZE ": 0x%02x\n", i, buf[i]);
else else
grub_dprintf ("usb", "Too much data for debug print...\n"); grub_dprintf ("usb", "Too much data for debug print...\n");
} }
@ -330,7 +330,7 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
/* Debug print of sent data. */ /* Debug print of sent data. */
if (size <= 256) if (size <= 256)
for (i=0; i<size; i++) for (i=0; i<size; i++)
grub_dprintf ("usb", "0x%02x: 0x%02x\n", i, buf[i]); grub_dprintf ("usb", "0x%02" PRIxGRUB_SIZE ": 0x%02x\n", i, buf[i]);
else else
grub_dprintf ("usb", "Too much data for debug print...\n"); grub_dprintf ("usb", "Too much data for debug print...\n");
} }

8
include/grub/types.h
View file

@ -92,10 +92,18 @@ typedef grub_int32_t grub_target_ssize_t;
typedef grub_uint64_t grub_addr_t; typedef grub_uint64_t grub_addr_t;
typedef grub_uint64_t grub_size_t; typedef grub_uint64_t grub_size_t;
typedef grub_int64_t grub_ssize_t; typedef grub_int64_t grub_ssize_t;
# if GRUB_CPU_SIZEOF_LONG == 8
# define PRIxGRUB_SIZE "lx"
# else
# define PRIxGRUB_SIZE "llx"
# endif
#else #else
typedef grub_uint32_t grub_addr_t; typedef grub_uint32_t grub_addr_t;
typedef grub_uint32_t grub_size_t; typedef grub_uint32_t grub_size_t;
typedef grub_int32_t grub_ssize_t; typedef grub_int32_t grub_ssize_t;
# define PRIxGRUB_SIZE "x"
#endif #endif
#if GRUB_CPU_SIZEOF_LONG == 8 #if GRUB_CPU_SIZEOF_LONG == 8