2010-09-09 Robert Millan <rmh@gnu.org>

	* util/grub-probe.c (probe): Fix a pair of unhandled error
	conditions.

diff --git a/ChangeLog b/ChangeLog
index 0593c7731cd0a620097367c9921de6e9f1e7649d..b0354a4fc3f400de280d5d4406f6823c5df630b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-09  Robert Millan  <rmh@gnu.org>
+
+       * util/grub-probe.c (probe): Fix a pair of unhandled error
+       conditions.
+
 2010-09-09  Robert Millan  <rmh@gnu.org>
 
        Basic Btrfs support (detection and UUID).

diff --git a/util/grub-probe.c b/util/grub-probe.c
index 4ee1227137850a28e79fe208f90debebdc6812b1..9f8a443c81c9ebc3683a9d4e590646b0369c4d1c 100644 (file)
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -234,7 +234,8 @@ probe (const char *path, char *device_name)
       if (! fs->uuid)
        grub_util_error ("%s does not support UUIDs", fs->name);
 
-      fs->uuid (dev, &uuid);
+      if (fs->uuid (dev, &uuid) != GRUB_ERR_NONE)
+       grub_util_error ("%s", grub_errmsg);
 
       printf ("%s\n", uuid);
     }
@@ -244,7 +245,8 @@ probe (const char *path, char *device_name)
       if (! fs->label)
        grub_util_error ("%s does not support labels", fs->name);
 
-      fs->label (dev, &label);
+      if (fs->label (dev, &label) != GRUB_ERR_NONE)
+       grub_util_error ("%s", grub_errmsg);
 
       printf ("%s\n", label);
     }