* grub-core/disk/lvm.c (grub_lvm_getvalue): Handle 64-bit values.

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-25 17:52:20 +02:00
parent fb022c79ef
commit 315654c269
2 changed files with 6 additions and 2 deletions

View file

@ -1,3 +1,7 @@
2012-06-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/lvm.c (grub_lvm_getvalue): Handle 64-bit values.
2012-06-25 Vladimir Serbinenko <phcoder@gmail.com> 2012-06-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/fat.c (grub_fat_iterate_dir_next): Don't stop on a space * grub-core/fs/fat.c (grub_fat_iterate_dir_next): Don't stop on a space

View file

@ -37,14 +37,14 @@ GRUB_MOD_LICENSE ("GPLv3+");
/* Go the string STR and return the number after STR. *P will point /* Go the string STR and return the number after STR. *P will point
at the number. In case STR is not found, *P will be NULL and the at the number. In case STR is not found, *P will be NULL and the
return value will be 0. */ return value will be 0. */
static int static grub_uint64_t
grub_lvm_getvalue (char **p, const char *str) grub_lvm_getvalue (char **p, const char *str)
{ {
*p = grub_strstr (*p, str); *p = grub_strstr (*p, str);
if (! *p) if (! *p)
return 0; return 0;
*p += grub_strlen (str); *p += grub_strlen (str);
return grub_strtoul (*p, p, 10); return grub_strtoull (*p, p, 10);
} }
#if 0 #if 0