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

* util/getroot.c (grub_find_root_devices_from_mountinfo): Fix types.

Browse source 
(grub_util_biosdisk_get_grub_dev): Fix format specification.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-11 11:41:22 +01:00
parent b77c2fb725
commit b055f8f676
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-11 Vladimir Serbinenko <phcoder@gmail.com>
* util/getroot.c (grub_find_root_devices_from_mountinfo): Fix types.
(grub_util_biosdisk_get_grub_dev): Fix format specification.
2012-02-11 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-11 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/emu/full.c (grub_arch_dl_get_tramp_got_size): Enable * grub-core/kern/emu/full.c (grub_arch_dl_get_tramp_got_size): Enable

6
util/getroot.c
View file

@ -372,7 +372,7 @@ grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
char *buf = NULL; char *buf = NULL;
size_t len = 0; size_t len = 0;
char **ret = NULL; char **ret = NULL;
int entry_len = 0, entry_max = 4; grub_size_t entry_len = 0, entry_max = 4;
struct mountinfo_entry *entries; struct mountinfo_entry *entries;
struct mountinfo_entry parent_entry = { 0, 0, 0, "", "", "", "" }; struct mountinfo_entry parent_entry = { 0, 0, 0, "", "", "", "" };
int i; int i;
@ -1991,7 +1991,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
const grub_partition_t partition) const grub_partition_t partition)
{ {
grub_disk_addr_t part_start = 0; grub_disk_addr_t part_start = 0;
grub_util_info ("Partition %d starts from %lu", grub_util_info ("Partition %d starts from %" PRIuGRUB_UINT64_T,
partition->number, partition->start); partition->number, partition->start);
part_start = grub_partition_get_start (partition); part_start = grub_partition_get_start (partition);
@ -2022,7 +2022,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
return 0; return 0;
} }
grub_util_info ("%s starts from %lu", os_dev, start); grub_util_info ("%s starts from %" PRIuGRUB_UINT64_T, os_dev, start);
if (start == 0 && device_is_wholedisk (os_dev)) if (start == 0 && device_is_wholedisk (os_dev))
return name; return name;