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

replace ROUND_UPTO with ALIGN_UP

Browse source
This commit is contained in:
BVK Chaitanya 2010-01-23 08:57:26 +05:30
parent bae09d0d47
commit 345dd552ad
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
script/execute.c
View file

@ -35,8 +35,6 @@ grub_script_execute_cmd (struct grub_script_cmd *cmd)
return cmd->exec (cmd); return cmd->exec (cmd);
} }
#define ROUND_UPTO(sz,up) (((sz) + (up) - 1) / (up) * (up))
/* Expand arguments in ARGLIST into multiple arguments. */ /* Expand arguments in ARGLIST into multiple arguments. */
char ** char **
grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist) grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist)
@ -58,7 +56,7 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist)
if (oom) if (oom)
return; return;
p = grub_realloc (argv, ROUND_UPTO (sizeof(char*) * (argc + 1), 32)); p = grub_realloc (argv, ALIGN_UP (sizeof(char*) * (argc + 1), 32));
if (!p) if (!p)
oom = 1; oom = 1;
else else
@ -80,7 +78,7 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist)
len = nchar ?: grub_strlen (str); len = nchar ?: grub_strlen (str);
old = argv[argc - 1] ? grub_strlen (argv[argc - 1]) : 0; old = argv[argc - 1] ? grub_strlen (argv[argc - 1]) : 0;
p = grub_realloc (argv[argc - 1], ROUND_UPTO(old + len + 1, 32)); p = grub_realloc (argv[argc - 1], ALIGN_UP(old + len + 1, 32));
if (p) if (p)
{ {