2008-07-14 Pavel Roskin <proski@gnu.org>

	* commands/blocklist.c (grub_cmd_blocklist): Fix format warning.
	* commands/cmp.c (grub_cmd_cmp): Likewise.
	* kern/dl.c (grub_dl_flush_cache): Likewise.
	(grub_dl_load_core): Likewise.
	* kern/elf.c (grub_elf32_load_phdrs): Likewise.
	(grub_elf64_load_phdrs): Likewise.

diff --git a/ChangeLog b/ChangeLog
index d8d20cb574467fa4a55f72cd94edd9bc13000e6d..fa8291b40d7d43096ff0ba63d2978097bfcb2959 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-14  Pavel Roskin  <proski@gnu.org>
+
+       * commands/blocklist.c (grub_cmd_blocklist): Fix format warning.
+       * commands/cmp.c (grub_cmd_cmp): Likewise.
+       * kern/dl.c (grub_dl_flush_cache): Likewise.
+       (grub_dl_load_core): Likewise.
+       * kern/elf.c (grub_elf32_load_phdrs): Likewise.
+       (grub_elf64_load_phdrs): Likewise.
+
 2008-07-13  Pavel Roskin  <proski@gnu.org>
 
        * lib/LzmaEnc.c (LzmaEnc_SetProps): Fix warning about comparison

diff --git a/commands/blocklist.c b/commands/blocklist.c
index df0e63227bc17c79e545fa82410c1e6c3295bb61..c797a5f1bdc64e4b4ad394da6c624d8074241901 100644 (file)
--- a/commands/blocklist.c
+++ b/commands/blocklist.c
@@ -72,7 +72,7 @@ grub_cmd_blocklist (struct grub_arg_list *state __attribute__ ((unused)),
       if (num_entries++)
        grub_printf (",");
 
-      grub_printf ("%llu", sector - part_start);
+      grub_printf ("%llu", (unsigned long long) (sector - part_start));
       if (num > 0)
        grub_printf ("+%u", num);
       if (offset != 0 || length != 0)

diff --git a/commands/cmp.c b/commands/cmp.c
index bb4de60e3d8e08238d487be43f650e227cd795b7..87620b624a56d15c10ec93e2ebd840981d92ea57 100644 (file)
--- a/commands/cmp.c
+++ b/commands/cmp.c
@@ -51,8 +51,8 @@ grub_cmd_cmp (struct grub_arg_list *state __attribute__ ((unused)),
 
   if (grub_file_size (file1) != grub_file_size (file2))
     grub_printf ("Differ in size: %llu [%s], %llu [%s]\n", 
-                grub_file_size (file1), args[0], 
-                grub_file_size (file2), args[1]);
+                (unsigned long long) grub_file_size (file1), args[0],
+                (unsigned long long) grub_file_size (file2), args[1]);
   else
     {
       pos = 0;
@@ -78,7 +78,7 @@ grub_cmd_cmp (struct grub_arg_list *state __attribute__ ((unused)),
              if (buf1[i] != buf2[i])
                {
                  grub_printf ("Differ at the offset %llu: 0x%x [%s], 0x%x [%s]\n",
-                              i + pos, buf1[i], args[0],
+                              (unsigned long long) (i + pos), buf1[i], args[0],
                               buf2[i], args[1]);
                  goto cleanup;
                }

diff --git a/kern/dl.c b/kern/dl.c
index 9e8c24abae0272221d6cd89b8d977271e3f29683..c0d9f1d03ecfaa362f5d4a05bfe727ddb46549e3 100644 (file)
--- a/kern/dl.c
+++ b/kern/dl.c
@@ -509,8 +509,8 @@ grub_dl_flush_cache (grub_dl_t mod)
 
   for (seg = mod->segment; seg; seg = seg->next) {
     if (seg->size) {
-      grub_dprintf ("modules", "flushing 0x%x bytes at %p\n", seg->size,
-                   seg->addr);
+      grub_dprintf ("modules", "flushing 0x%lx bytes at %p\n",
+                   (unsigned long) seg->size, seg->addr);
       grub_arch_sync_caches (seg->addr, seg->size);
     }
   }
@@ -523,7 +523,8 @@ grub_dl_load_core (void *addr, grub_size_t size)
   Elf_Ehdr *e;
   grub_dl_t mod;
 
-  grub_dprintf ("modules", "module at %p, size 0x%x\n", addr, size);
+  grub_dprintf ("modules", "module at %p, size 0x%lx\n", addr,
+               (unsigned long) size);
   e = addr;
   if (grub_dl_check_header (e, size))
     return 0;

diff --git a/kern/elf.c b/kern/elf.c
index cb8a7228686c60a778fe4f5900ee119c7c77777f..2b1e223f797e8f22feaf96805dd16b8e15ea0eaa 100644 (file)
--- a/kern/elf.c
+++ b/kern/elf.c
@@ -123,9 +123,9 @@ grub_elf32_load_phdrs (grub_elf_t elf)
 
   phdrs_size = elf->ehdr.ehdr32.e_phnum * elf->ehdr.ehdr32.e_phentsize;
 
-  grub_dprintf ("elf", "Loading program headers at 0x%llx, size 0x%x.\n",
+  grub_dprintf ("elf", "Loading program headers at 0x%llx, size 0x%lx.\n",
                (unsigned long long) elf->ehdr.ehdr32.e_phoff,
-               phdrs_size);
+               (unsigned long) phdrs_size);
 
   elf->phdrs = grub_malloc (phdrs_size);
   if (! elf->phdrs)
@@ -301,9 +301,9 @@ grub_elf64_load_phdrs (grub_elf_t elf)
 
   phdrs_size = elf->ehdr.ehdr64.e_phnum * elf->ehdr.ehdr64.e_phentsize;
 
-  grub_dprintf ("elf", "Loading program headers at 0x%llx, size 0x%x.\n",
+  grub_dprintf ("elf", "Loading program headers at 0x%llx, size 0x%lx.\n",
                (unsigned long long) elf->ehdr.ehdr64.e_phoff,
-               phdrs_size);
+               (unsigned long) phdrs_size);
 
   elf->phdrs = grub_malloc (phdrs_size);
   if (! elf->phdrs)