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

	(grub_util_biosdisk_get_grub_dev): Fix format specification.

diff --git a/ChangeLog b/ChangeLog
index 3ee70d66ba9cde32b19c32391907dfbfa229ae5c..dd8568d9ca2c41cfad2fe995e1ab8e6d9e1f094c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * 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 1ef3d42015bc3874ec98197147b593e521ab5c56..c93ecd59e4d9778bca417791fc9cf6aa280063fe 100644 (file)
--- 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;