vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
* 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.
This commit is contained in:
proski 2008-07-01 23:02:16 +00:00
parent 56c7668bae
commit 0e9e51ec4f
6 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
disk/raid.c
View file

@ -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;
}
}