[1703] 2008-07-14 Pavel Roskin <address@hidden>

[Pavel Roskin]

Revision: 1703
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1703
Author:   proski
Date:     2008-07-14 04:46:19 +0000 (Mon, 14 Jul 2008)

Log Message:
-----------
2008-07-14  Pavel Roskin  <address@hidden>

        * 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.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/commands/blocklist.c
    trunk/grub2/commands/cmp.c
    trunk/grub2/kern/dl.c
    trunk/grub2/kern/elf.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-07-13 18:13:36 UTC (rev 1702)
+++ trunk/grub2/ChangeLog       2008-07-14 04:46:19 UTC (rev 1703)
@@ -1,3 +1,12 @@
+2008-07-14  Pavel Roskin  <address@hidden>
+
+       * 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  <address@hidden>
 
        * lib/LzmaEnc.c (LzmaEnc_SetProps): Fix warning about comparison

Modified: trunk/grub2/commands/blocklist.c
===================================================================
--- trunk/grub2/commands/blocklist.c    2008-07-13 18:13:36 UTC (rev 1702)
+++ trunk/grub2/commands/blocklist.c    2008-07-14 04:46:19 UTC (rev 1703)
@@ -72,7 +72,7 @@
       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)

Modified: trunk/grub2/commands/cmp.c
===================================================================
--- trunk/grub2/commands/cmp.c  2008-07-13 18:13:36 UTC (rev 1702)
+++ trunk/grub2/commands/cmp.c  2008-07-14 04:46:19 UTC (rev 1703)
@@ -51,8 +51,8 @@
 
   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 @@
              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;
                }

Modified: trunk/grub2/kern/dl.c
===================================================================
--- trunk/grub2/kern/dl.c       2008-07-13 18:13:36 UTC (rev 1702)
+++ trunk/grub2/kern/dl.c       2008-07-14 04:46:19 UTC (rev 1703)
@@ -509,8 +509,8 @@
 
   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 @@
   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;

Modified: trunk/grub2/kern/elf.c
===================================================================
--- trunk/grub2/kern/elf.c      2008-07-13 18:13:36 UTC (rev 1702)
+++ trunk/grub2/kern/elf.c      2008-07-14 04:46:19 UTC (rev 1703)
@@ -123,9 +123,9 @@
 
   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 @@
 
   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)