2009-07-06 Pavel Roskin <proski@gnu.org>

	* commands/search.c (search_fs): Replace QUID macro with quid_fn
	function pointer.

diff --git a/ChangeLog b/ChangeLog
index 521a32c545d4d97a0c6089a189d3100131ebff24..fd741626a589b161cd707ee5590235e050101d45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-06  Pavel Roskin  <proski@gnu.org>
+
+       * commands/search.c (search_fs): Replace QUID macro with quid_fn
+       function pointer.
+
 2009-07-06  Daniel Mierswa  <impulze@impulze.org>
 
        * commands/search.c (search_fs): Use grub_strcasecmp() for UUID

diff --git a/commands/search.c b/commands/search.c
index d749bca11a428a3d763bf8e0be76c30338ba8447..b29eefb41abe34e09524673841e9e57f5dd229cf 100644 (file)
--- a/commands/search.c
+++ b/commands/search.c
@@ -68,17 +68,17 @@ search_fs (const char *key, const char *var, int no_floppy, int is_uuid)
        {
          grub_fs_t fs;
          int (*compare_fn) (const char *, const char *);
+         grub_err_t (*quid_fn) (grub_device_t, char **);
 
          fs = grub_fs_probe (dev);
          compare_fn = is_uuid ? grub_strcasecmp : grub_strcmp;
+         quid_fn = is_uuid ? fs->uuid : fs->label;
 
-#define QUID(x)        (is_uuid ? (x)->uuid : (x)->label)
-
-         if (fs && QUID(fs))
+         if (fs && quid_fn)
            {
              char *quid;
 
-             (QUID(fs)) (dev, &quid);
+             quid_fn (dev, &quid);
              if (grub_errno == GRUB_ERR_NONE && quid)
                {
                  if (compare_fn (quid, key) == 0)