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
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -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> 2008-06-30 Pavel Roskin <proski@gnu.org>
* util/i386/pc/grub-setup.c (setup): Write install_dos_part and * util/i386/pc/grub-setup.c (setup): Write install_dos_part and

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->id = array->number;
disk->data = array; 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) switch (array->level)
{ {
@ -124,7 +125,8 @@ grub_raid_open (const char *name, grub_disk_t disk)
break; 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; 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) " grub_dprintf ("raid", "Array contains only one disk, but its size (0x%llx) "
"doesn't match with size indicated by superblock (0x%llx). " "doesn't match with size indicated by superblock (0x%llx). "
"Assuming superblock is wrong.\n", "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; array->disk_size = array->device[sb.this_disk.number]->total_sectors;
} }
else if (array->level == 1) 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). " "doesn't match with size indicated by superblock (0x%llx). "
"Assuming superblock is wrong.\n", "Assuming superblock is wrong.\n",
sb.this_disk.number, 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; array->disk_size = array->device[sb.this_disk.number]->total_sectors;
} }
} }

2
fs/ntfs.c
View file

@ -1094,7 +1094,7 @@ grub_ntfs_uuid (grub_device_t device, char **uuid)
if (data) if (data)
{ {
*uuid = grub_malloc (16 + sizeof ('\0')); *uuid = grub_malloc (16 + sizeof ('\0'));
grub_sprintf (*uuid, "%016llx", data->uuid); grub_sprintf (*uuid, "%016llx", (unsigned long long) data->uuid);
} }
else else
*uuid = NULL; *uuid = NULL;

4
fs/reiserfs.c
View file

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

5
partmap/gpt.c
View file

@ -98,8 +98,9 @@ gpt_partition_map_iterate (grub_disk_t disk,
part.partmap = &grub_gpt_partition_map; part.partmap = &grub_gpt_partition_map;
part.data = &entry; part.data = &entry;
grub_dprintf ("gpt", "GPT entry %d: start=%lld, length=%lld\n", grub_dprintf ("gpt", "GPT entry %d: start=%lld, length=%lld\n", i,
i, part.start, part.len); (unsigned long long) part.start,
(unsigned long long) part.len);
if (hook (disk, &part)) if (hook (disk, &part))
return grub_errno; return grub_errno;

4
partmap/pc.c
View file

@ -138,7 +138,9 @@ pc_partition_map_iterate (grub_disk_t disk,
grub_dprintf ("partition", grub_dprintf ("partition",
"partition %d: flag 0x%x, type 0x%x, start 0x%llx, len 0x%llx\n", "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 this is a GPT partition, this MBR is just a dummy. */
if (e->type == GRUB_PC_PARTITION_TYPE_GPT_DISK && p.index == 0) if (e->type == GRUB_PC_PARTITION_TYPE_GPT_DISK && p.index == 0)