From: proski Date: Wed, 1 Jul 2009 15:39:21 +0000 (+0000) Subject: 2009-07-01 Pavel Roskin X-Git-Tag: 1.98~742 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ef0084d8065a40dfab5d35881ea558880bc41c6;p=thirdparty%2Fgrub.git 2009-07-01 Pavel Roskin * kern/mm.c: Use correct format to print size_t. --- diff --git a/ChangeLog b/ChangeLog index 757f1bbe5..38d3a8a98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2009-07-01 Pavel Roskin + * kern/mm.c: Use correct format to print size_t. + * include/grub/elf.h: Define Elf_Sword and Elf_Xword. * kern/i386/dl.c: Use ELF symbols without "32" or "64". * kern/powerpc/dl.c: Likewise. diff --git a/kern/mm.c b/kern/mm.c index a31dc2efd..9a0ae56ed 100644 --- a/kern/mm.c +++ b/kern/mm.c @@ -515,7 +515,7 @@ grub_debug_malloc (const char *file, int line, grub_size_t size) void *ptr; if (grub_mm_debug) - grub_printf ("%s:%d: malloc (0x%x) = ", file, line, size); + grub_printf ("%s:%d: malloc (0x%zx) = ", file, line, size); ptr = grub_malloc (size); if (grub_mm_debug) grub_printf ("%p\n", ptr); @@ -534,7 +534,7 @@ void * grub_debug_realloc (const char *file, int line, void *ptr, grub_size_t size) { if (grub_mm_debug) - grub_printf ("%s:%d: realloc (%p, 0x%x) = ", file, line, ptr, size); + grub_printf ("%s:%d: realloc (%p, 0x%zx) = ", file, line, ptr, size); ptr = grub_realloc (ptr, size); if (grub_mm_debug) grub_printf ("%p\n", ptr); @@ -548,7 +548,7 @@ grub_debug_memalign (const char *file, int line, grub_size_t align, void *ptr; if (grub_mm_debug) - grub_printf ("%s:%d: memalign (0x%x, 0x%x) = ", + grub_printf ("%s:%d: memalign (0x%zx, 0x%zx) = ", file, line, align, size); ptr = grub_memalign (align, size); if (grub_mm_debug)