* commands/lsmmap.c (grub_cmd_lsmmap): Add casts to avoid printf

	warnings.
	* kern/ieee1275/openfw.c (grub_claimmap): Likewise.
	* disk/ieee1275/ofdisk.c (grub_ofdisk_open, grub_ofdisk_close,
	grub_ofdisk_read): Likewise, and deal similarly with the fact that
	ihandles have a 32-bit type but need to be stored in a "void *".

diff --git a/ChangeLog b/ChangeLog
index 89662be1439fc298f500c24e7ed4cf33a63c1421..66e9d326414f7ea02d659689dbc9a4caae6e4aba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-04-29  David S. Miller  <davem@davemloft.net>
+
+       * commands/lsmmap.c (grub_cmd_lsmmap): Add casts to avoid printf
+       warnings.
+       * kern/ieee1275/openfw.c (grub_claimmap): Likewise.
+       * disk/ieee1275/ofdisk.c (grub_ofdisk_open, grub_ofdisk_close,
+       grub_ofdisk_read): Likewise, and deal similarly with the fact that
+       ihandles have a 32-bit type but need to be stored in a "void *".
+
 2009-04-28  Pavel Roskin  <proski@gnu.org>
 
        * disk/fs_uuid.c (grub_fs_uuid_open): Use parent->data for dev,

diff --git a/commands/lsmmap.c b/commands/lsmmap.c
index 562ba21a89f0c6756b77603ca803485db98f4770..4fe9a5a7aee2ca014edc06b4122f219d983506de 100644 (file)
--- a/commands/lsmmap.c
+++ b/commands/lsmmap.c
@@ -30,7 +30,7 @@ grub_cmd_lsmmap (grub_command_t cmd __attribute__ ((unused)),
   int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
     {
       grub_printf ("base_addr = 0x%llx, length = 0x%llx, type = 0x%x\n",
-                  addr, size, type);
+                  (long long) addr, (long long) size, type);
       return 0;
     }
   grub_machine_mmap_iterate (hook);

diff --git a/disk/ieee1275/ofdisk.c b/disk/ieee1275/ofdisk.c
index 202be2455aa631933c6cc62db07babe0cb8281ac..e2c7867e6e8c08be033114461ab5ab246384676b 100644 (file)
--- a/disk/ieee1275/ofdisk.c
+++ b/disk/ieee1275/ofdisk.c
@@ -155,7 +155,8 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
       goto fail;
     }
 
-  grub_dprintf ("disk", "Opened `%s' as handle %p.\n", op->devpath, (void *) dev_ihandle);
+  grub_dprintf ("disk", "Opened `%s' as handle %p.\n", op->devpath,
+               (void *) (unsigned long) dev_ihandle);
 
   if (grub_ieee1275_finddevice (op->devpath, &dev))
     {
@@ -185,7 +186,7 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
 
   /* XXX: Read this, somehow.  */
   disk->has_partitions = 1;
-  disk->data = (void *) dev_ihandle;
+  disk->data = (void *) (unsigned long) dev_ihandle;
   return 0;
 
  fail:
@@ -199,7 +200,7 @@ grub_ofdisk_close (grub_disk_t disk)
 {
   grub_dprintf ("disk", "Closing handle %p.\n",
                (void *) disk->data);
-  grub_ieee1275_close ((grub_ieee1275_ihandle_t) disk->data);
+  grub_ieee1275_close ((grub_ieee1275_ihandle_t) (unsigned long) disk->data);
 }
 
 static grub_err_t
@@ -211,21 +212,21 @@ grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
 
   grub_dprintf ("disk",
                "Reading handle %p: sector 0x%llx, size 0x%lx, buf %p.\n",
-               (void *) disk->data, sector, (long) size, buf);
+               (void *) disk->data, (long long) sector, (long) size, buf);
 
   pos = sector * 512UL;
 
-  grub_ieee1275_seek ((grub_ieee1275_ihandle_t) disk->data, (int) (pos >> 32),
-                     (int) pos & 0xFFFFFFFFUL, &status);
+  grub_ieee1275_seek ((grub_ieee1275_ihandle_t) (unsigned long) disk->data,
+                     (int) (pos >> 32), (int) pos & 0xFFFFFFFFUL, &status);
   if (status < 0)
     return grub_error (GRUB_ERR_READ_ERROR,
                       "Seek error, can't seek block %llu",
-                      sector);
-  grub_ieee1275_read ((grub_ieee1275_ihandle_t) disk->data, buf,
-                     size * 512UL, &actual);
+                      (long long) sector);
+  grub_ieee1275_read ((grub_ieee1275_ihandle_t) (unsigned long) disk->data,
+                     buf, size * 512UL, &actual);
   if (actual != actual)
     return grub_error (GRUB_ERR_READ_ERROR, "Read error on block: %llu",
-                      sector);
+                      (long long) sector);
     
   return 0;
 }

diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index b23149e7ec520afb40f7b616bed8453e80d73a58..7d6502379747b489f9afc1c0a57241f689e39dc2 100644 (file)
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -238,7 +238,8 @@ grub_claimmap (grub_addr_t addr, grub_size_t size)
   if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_REAL_MODE)
       && grub_map (addr, addr, size, 0x00))
     {
-      grub_printf ("map failed: address 0x%x, size 0x%x\n", addr, size);
+      grub_printf ("map failed: address 0x%llx, size 0x%llx\n",
+                  (long long) addr, (long long) size);
       grub_ieee1275_release (addr, size);
       return -1;
     }