From 50f0bcdab58ff554916fb0dda7bb4505f0ac1484 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 2 Jul 2010 18:04:54 +0100
Subject: [PATCH] * 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.

---
 ChangeLog            | 8 ++++++++
 disk/usbms.c         | 4 ++--
 include/grub/types.h | 8 ++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 36dd9fb49..47da0d981 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* gfxmenu/gui_list.c (draw_menu): Use viewport to simplify code and fix
diff --git a/disk/usbms.c b/disk/usbms.c
index a49b30e7e..f913ee3f7 100644
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -312,7 +312,7 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
       grub_dprintf ("usb", "buf:\n");
       if (size <= 64)
         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
           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. */
       if (size <= 256)
         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
           grub_dprintf ("usb", "Too much data for debug print...\n");
     }
diff --git a/include/grub/types.h b/include/grub/types.h
index a9e8adfd6..4499e4538 100644
--- a/include/grub/types.h
+++ b/include/grub/types.h
@@ -92,10 +92,18 @@ typedef grub_int32_t	grub_target_ssize_t;
 typedef grub_uint64_t	grub_addr_t;
 typedef grub_uint64_t	grub_size_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
 typedef grub_uint32_t	grub_addr_t;
 typedef grub_uint32_t	grub_size_t;
 typedef grub_int32_t	grub_ssize_t;
+
+# define PRIxGRUB_SIZE	"x"
 #endif
 
 #if GRUB_CPU_SIZEOF_LONG == 8