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

replaced magic numbers with macros

Browse source
This commit is contained in:
BVK Chaitanya 2010-01-23 19:46:28 +05:30
parent 1368740e69
commit f4c499f86f
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
script/execute.c
View file

@ -35,6 +35,9 @@ grub_script_execute_cmd (struct grub_script_cmd *cmd)
return cmd->exec (cmd); return cmd->exec (cmd);
} }
#define ARG_ALLOCATION_UNIT (32 * sizeof (char))
#define ARGV_ALLOCATION_UNIT (8 * sizeof (void*))
/* 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, int *count) grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count)
@ -56,7 +59,7 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *c
if (oom) if (oom)
return; return;
p = grub_realloc (argv, ALIGN_UP (sizeof(char*) * (argc + 1), 32)); p = grub_realloc (argv, ALIGN_UP (sizeof(char*) * (argc + 1), ARGV_ALLOCATION_UNIT));
if (!p) if (!p)
oom = 1; oom = 1;
else else
@ -78,7 +81,7 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *c
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], ALIGN_UP(old + len + 1, 32)); p = grub_realloc (argv[argc - 1], ALIGN_UP(old + len + 1, ARG_ALLOCATION_UNIT));
if (p) if (p)
{ {