* grub-core/kern/misc.c (grub_vsnprintf_real): Remove needless explicit

	\0 checking.

diff --git a/ChangeLog b/ChangeLog
index 8d798221d1d128d9240b1af1120b4d1cf9b9ae86..e53bb88d2d0bd7834bcb85d99d712974b8b40d8a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/misc.c (grub_vsnprintf_real): Remove needless explicit
+       \0 checking.
+
 2013-10-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/lib/legacy_parse.c: Add support for "nd" disk.

diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index aa8a003f14f0889efb9166ea55ab7e096b9c39e5..431522e29a88d5916d6f5f71e0811a1d3a5a27e0 100644 (file)
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -664,34 +664,33 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0, va_list a
       if (c != '%')
        continue;
 
-      if (*fmt && *fmt =='-')
+      if (*fmt =='-')
        fmt++;
 
-      while (*fmt && grub_isdigit (*fmt))
+      while (grub_isdigit (*fmt))
        fmt++;
 
-      if (*fmt && *fmt == '$')
+      if (*fmt == '$')
        fmt++;
 
-      if (*fmt && *fmt =='-')
+      if (*fmt =='-')
        fmt++;
 
-      while (*fmt && grub_isdigit (*fmt))
+      while (grub_isdigit (*fmt))
        fmt++;
 
-      if (*fmt && *fmt =='.')
+      if (*fmt =='.')
        fmt++;
 
-      while (*fmt && grub_isdigit (*fmt))
+      while (grub_isdigit (*fmt))
        fmt++;
 
       c = *fmt++;
       if (c == 'l')
-       {
-         c = *fmt++;
-         if (c == 'l')
-           c = *fmt++;
-       }
+       c = *fmt++;
+      if (c == 'l')
+       c = *fmt++;
+
       switch (c)
        {
        case 'p':