vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/lib/arg.c (grub_arg_list_alloc): Use shifts rather

Browse source 
than divisions.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-03-10 20:08:15 +01:00
parent d2789cf0b8
commit ea811130ea
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-03-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/arg.c (grub_arg_list_alloc): Use shifts rather
than divisions.
2013-03-10 Vladimir Serbinenko <phcoder@gmail.com> 2013-03-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/verify.c (grub_verify_signature): Use unsigned * grub-core/commands/verify.c (grub_verify_signature): Use unsigned

6
grub-core/lib/arg.c
View file

@ -428,7 +428,7 @@ grub_arg_list_alloc(grub_extcmd_t extcmd, int argc,
{ {
int i; int i;
char **args; char **args;
unsigned argcnt; grub_size_t argcnt;
struct grub_arg_list *list; struct grub_arg_list *list;
const struct grub_arg_option *options; const struct grub_arg_option *options;
@ -440,7 +440,7 @@ grub_arg_list_alloc(grub_extcmd_t extcmd, int argc,
for (i = 0; options[i].doc; i++) for (i = 0; options[i].doc; i++)
{ {
if (options[i].flags & GRUB_ARG_OPTION_REPEATABLE) if (options[i].flags & GRUB_ARG_OPTION_REPEATABLE)
argcnt += (argc + 1) / 2 + 1; /* max possible for any option */ argcnt += ((grub_size_t) argc + 1) / 2 + 1; /* max possible for any option */
} }
list = grub_zalloc (sizeof (*list) * i + sizeof (char*) * argcnt); list = grub_zalloc (sizeof (*list) * i + sizeof (char*) * argcnt);
@ -456,7 +456,7 @@ grub_arg_list_alloc(grub_extcmd_t extcmd, int argc,
if (options[i].flags & GRUB_ARG_OPTION_REPEATABLE) if (options[i].flags & GRUB_ARG_OPTION_REPEATABLE)
{ {
list[i].args = args; list[i].args = args;
args += argc / 2 + 1; args += (grub_size_t) argc / 2 + 1;
} }
} }
return list; return list;