From b055f8f676e4c0ff6c1f0a33bf35ab8182702de6 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sat, 11 Feb 2012 11:41:22 +0100 Subject: [PATCH] * util/getroot.c (grub_find_root_devices_from_mountinfo): Fix types. (grub_util_biosdisk_get_grub_dev): Fix format specification. --- ChangeLog | 5 +++++ util/getroot.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ee70d66b..dd8568d9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-02-11 Vladimir Serbinenko + + * 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 * grub-core/kern/emu/full.c (grub_arch_dl_get_tramp_got_size): Enable diff --git a/util/getroot.c b/util/getroot.c index 1ef3d4201..c93ecd59e 100644 --- a/util/getroot.c +++ b/util/getroot.c @@ -372,7 +372,7 @@ grub_find_root_devices_from_mountinfo (const char *dir, char **relroot) char *buf = NULL; size_t len = 0; 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 parent_entry = { 0, 0, 0, "", "", "", "" }; int i; @@ -1991,7 +1991,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev) const grub_partition_t partition) { 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); part_start = grub_partition_get_start (partition); @@ -2022,7 +2022,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev) 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)) return name;