From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Aug 2013 20:45:41 +0000 (+0200)
Subject: 	* grub-core/fs/zfs/zfs.c (check_feature): Cleanup and remove
X-Git-Tag: grub-2.02-beta1~924
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=459b1d917171c2650509a148624f9f7160d439c1;p=thirdparty%2Fgrub.git

	* grub-core/fs/zfs/zfs.c (check_feature): Cleanup and remove
	inappropriate printf.
---

diff --git a/ChangeLog b/ChangeLog
index ac713f6a8..f450fe1ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/zfs/zfs.c (check_feature): Cleanup and remove
+	inappropriate printf.
+
 2013-07-25  Andrey Borzenkov <arvidjaar@gmail.com>
 
 	* .bzrignore: Remove grub-core/lib/dtc-grub,
diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
index dfab221cd..f4acfd827 100644
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -4135,17 +4135,17 @@ grub_zfs_dir (grub_device_t device, const char *path,
 }
 
 static int
-check_feature(const char *name, grub_uint64_t val,__attribute__((unused)) struct grub_zfs_dir_ctx *ctx)
+check_feature (const char *name, grub_uint64_t val,
+	       struct grub_zfs_dir_ctx *ctx __attribute__((unused)))
 {
   int i;
-  if(val ==0) return 0;
-  if(*name==0) return 0;
+  if (val == 0)
+    return 0;
+  if (name[0] == 0)
+    return 0;
   for (i = 0; spa_feature_names[i] != NULL; i++) 
-    {
-      if (grub_strcmp(name, spa_feature_names[i]) == 0) 
-        return 0;
-    }
-  grub_printf("missing feature for read '%s'\n",name);
+    if (grub_strcmp (name, spa_feature_names[i]) == 0) 
+      return 0;
   return 1;
 }