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

\0 checking.
This commit is contained in:
Vladimir Serbinenko 2013-10-27 13:20:50 +01:00
parent cf880639f6
commit 891b713be3
2 changed files with 16 additions and 12 deletions

View file

@ -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> 2013-10-27 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/legacy_parse.c: Add support for "nd" disk. * grub-core/lib/legacy_parse.c: Add support for "nd" disk.

View file

@ -664,34 +664,33 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0, va_list a
if (c != '%') if (c != '%')
continue; continue;
if (*fmt && *fmt =='-') if (*fmt =='-')
fmt++; fmt++;
while (*fmt && grub_isdigit (*fmt)) while (grub_isdigit (*fmt))
fmt++; fmt++;
if (*fmt && *fmt == '$') if (*fmt == '$')
fmt++; fmt++;
if (*fmt && *fmt =='-') if (*fmt =='-')
fmt++; fmt++;
while (*fmt && grub_isdigit (*fmt)) while (grub_isdigit (*fmt))
fmt++; fmt++;
if (*fmt && *fmt =='.') if (*fmt =='.')
fmt++; fmt++;
while (*fmt && grub_isdigit (*fmt)) while (grub_isdigit (*fmt))
fmt++; fmt++;
c = *fmt++; c = *fmt++;
if (c == 'l') if (c == 'l')
{ c = *fmt++;
c = *fmt++; if (c == 'l')
if (c == 'l') c = *fmt++;
c = *fmt++;
}
switch (c) switch (c)
{ {
case 'p': case 'p':