From 0e9e51ec4fcab669635f35c3b8bc253eead52fd3 Mon Sep 17 00:00:00 2001 From: proski Date: Tue, 1 Jul 2008 23:02:16 +0000 Subject: [PATCH] 2008-07-01 Pavel Roskin * 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. --- ChangeLog | 11 +++++++++++ disk/raid.c | 12 ++++++++---- fs/ntfs.c | 2 +- fs/reiserfs.c | 4 ++-- partmap/gpt.c | 5 +++-- partmap/pc.c | 4 +++- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab079c8df..68867d55b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-07-01 Pavel Roskin + + * 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 * util/i386/pc/grub-setup.c (setup): Write install_dos_part and diff --git a/disk/raid.c b/disk/raid.c index c906edaf2..b8a5e1210 100644 --- 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 5608e4e23..3363eb02b 100644 --- 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 bf20f8736..ea6e5e39b 100644 --- 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 36eaef21c..ddfde2ec9 100644 --- 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 f9268a75d..2fba45dbb 100644 --- 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)