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

	* disk/raid.c: Cast grub_dprintf() arguments to unsigned long
	long if the format specifier expects it.
	* partmap/gpt.c (gpt_partition_map_iterate): Likewise.
	* partmap/pc.c (pc_partition_map_iterate): Likewise.
	* fs/ntfs.c (grub_ntfs_uuid): Cast data->uuid to unsigned long
	long to fix a warning.
	* fs/reiserfs.c (grub_reiserfs_read): Change casts in
	grub_dprintf() arguments to fix warnings.

diff --git a/ChangeLog b/ChangeLog
index ab079c8dfa93c81147cf5e8bb98d3e497a435245..68867d55b653566e834c0dea8e9f47d72ddff1d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-07-01  Pavel Roskin  <proski@gnu.org>
+
+       * disk/raid.c: Cast grub_dprintf() arguments to unsigned long
+       long if the format specifier expects it.
+       * partmap/gpt.c (gpt_partition_map_iterate): Likewise.
+       * partmap/pc.c (pc_partition_map_iterate): Likewise.
+       * fs/ntfs.c (grub_ntfs_uuid): Cast data->uuid to unsigned long
+       long to fix a warning.
+       * fs/reiserfs.c (grub_reiserfs_read): Change casts in
+       grub_dprintf() arguments to fix warnings.
+
 2008-06-30  Pavel Roskin  <proski@gnu.org>
 
        * util/i386/pc/grub-setup.c (setup): Write install_dos_part and

diff --git a/disk/raid.c b/disk/raid.c
index c906edaf203df2182218fefb9cb705d3e86e9974..b8a5e12103df386d51985ab94b47b9541ebcf929 100644 (file)
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -106,7 +106,8 @@ grub_raid_open (const char *name, grub_disk_t disk)
   disk->id = array->number;
   disk->data = array;
 
-  grub_dprintf ("raid", "%s: total_devs=%d, disk_size=%d\n", name, array->total_devs, array->disk_size);
+  grub_dprintf ("raid", "%s: total_devs=%d, disk_size=%lld\n", name,
+               array->total_devs, (unsigned long long) array->disk_size);
 
   switch (array->level)
     {
@@ -124,7 +125,8 @@ grub_raid_open (const char *name, grub_disk_t disk)
       break;
     }
 
-  grub_dprintf ("raid", "%s: level=%d, total_sectors=%d\n", name, array->level, disk->total_sectors);
+  grub_dprintf ("raid", "%s: level=%d, total_sectors=%lld\n", name,
+               array->level, (unsigned long long) disk->total_sectors);
   
   return 0;
 }
@@ -531,7 +533,8 @@ grub_raid_scan_device (const char *name)
          grub_dprintf ("raid", "Array contains only one disk, but its size (0x%llx) "
                        "doesn't match with size indicated by superblock (0x%llx).  "
                        "Assuming superblock is wrong.\n",
-                       array->device[sb.this_disk.number]->total_sectors, array->disk_size);
+                       (unsigned long long) array->device[sb.this_disk.number]->total_sectors,
+                       (unsigned long long) array->disk_size);
          array->disk_size = array->device[sb.this_disk.number]->total_sectors;
        }
       else if (array->level == 1)
@@ -540,7 +543,8 @@ grub_raid_scan_device (const char *name)
                        "doesn't match with size indicated by superblock (0x%llx).  "
                        "Assuming superblock is wrong.\n",
                        sb.this_disk.number,
-                       array->device[sb.this_disk.number]->total_sectors, array->disk_size);
+                       (unsigned long long) array->device[sb.this_disk.number]->total_sectors,
+                       (unsigned long long) array->disk_size);
          array->disk_size = array->device[sb.this_disk.number]->total_sectors;
        }
     }

diff --git a/fs/ntfs.c b/fs/ntfs.c
index 5608e4e237560001e25282914f85c72d8927b51d..3363eb02bca78ff30676c27899d57ef8a324cdc0 100644 (file)
--- a/fs/ntfs.c
+++ b/fs/ntfs.c
@@ -1094,7 +1094,7 @@ grub_ntfs_uuid (grub_device_t device, char **uuid)
   if (data)
     {
       *uuid = grub_malloc (16 + sizeof ('\0'));
-      grub_sprintf (*uuid, "%016llx", data->uuid);
+      grub_sprintf (*uuid, "%016llx", (unsigned long long) data->uuid);
     }
   else
     *uuid = NULL;

diff --git a/fs/reiserfs.c b/fs/reiserfs.c
index bf20f8736ea0c8b21abe0bf141aef5d334a6229c..ea6e5e39b8b5c05af38a707544c8bfad3692db00 100644 (file)
--- a/fs/reiserfs.c
+++ b/fs/reiserfs.c
@@ -1120,7 +1120,7 @@ grub_reiserfs_read (grub_file_t file, char *buf, grub_size_t len)
               grub_dprintf ("reiserfs",
                             "Reading direct block %u from %u to %u...\n",
                             (unsigned) block, (unsigned) offset,
-                            (unsigned) offset + length);
+                            (unsigned) (offset + length));
               found.data->disk->read_hook = file->read_hook;
               grub_disk_read (found.data->disk,
                               block,
@@ -1165,7 +1165,7 @@ grub_reiserfs_read (grub_file_t file, char *buf, grub_size_t len)
                   grub_dprintf ("reiserfs",
                                 "Reading indirect block %u from %u to %u...\n",
                                 (unsigned) block, (unsigned) offset,
-                                (unsigned) offset + length);
+                                (unsigned) (offset + length));
 #if 0
                   grub_dprintf ("reiserfs",
                                 "\nib=%04d/%04d, ip=%d, cp=%d, fp=%d, off=%d, l=%d, tl=%d\n",

diff --git a/partmap/gpt.c b/partmap/gpt.c
index 36eaef21c736819d96c568b0a7cbf20e4921fe23..ddfde2ec99e0b3c76f66a573b6657939fd63a13a 100644 (file)
--- a/partmap/gpt.c
+++ b/partmap/gpt.c
@@ -98,8 +98,9 @@ gpt_partition_map_iterate (grub_disk_t disk,
          part.partmap = &grub_gpt_partition_map;
          part.data = &entry;
 
-         grub_dprintf ("gpt", "GPT entry %d: start=%lld, length=%lld\n",
-                       i, part.start, part.len);
+         grub_dprintf ("gpt", "GPT entry %d: start=%lld, length=%lld\n", i,
+                       (unsigned long long) part.start,
+                       (unsigned long long) part.len);
 
          if (hook (disk, &part))
            return grub_errno;

diff --git a/partmap/pc.c b/partmap/pc.c
index f9268a75d6ebcc7a26c13008a4d049f39b096323..2fba45dbb723d593ae0bf1e431047261a5db0a05 100644 (file)
--- a/partmap/pc.c
+++ b/partmap/pc.c
@@ -138,7 +138,9 @@ pc_partition_map_iterate (grub_disk_t disk,
 
          grub_dprintf ("partition",
                        "partition %d: flag 0x%x, type 0x%x, start 0x%llx, len 0x%llx\n",
-                       p.index, e->flag, pcdata.dos_type, p.start, p.len);
+                       p.index, e->flag, pcdata.dos_type,
+                       (unsigned long long) p.start,
+                       (unsigned long long) p.len);
 
          /* If this is a GPT partition, this MBR is just a dummy.  */
          if (e->type == GRUB_PC_PARTITION_TYPE_GPT_DISK && p.index == 0)