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

Remove several trivially-unnecessary uses of nested functions.

Browse source 
* grub-core/commands/i386/pc/sendkey.c
(grub_cmd_sendkey: find_key_code, find_ascii_code): Make static
instead of nested.
* grub-core/commands/legacycfg.c (legacy_file: getline): Likewise.
Rename to ...
(legacy_file_getline): ... this.
* grub-core/commands/loadenv.c (grub_cmd_load_env: set_var):
Likewise.
* grub-core/kern/corecmd.c (grub_core_cmd_set: print_env): Likewise.
* grub-core/kern/fs.c (grub_fs_probe: dummy_func): Likewise.  Rename
to ...
(probe_dummy_iter): ... this.
* grub-core/kern/i386/coreboot/mmap.c
(grub_linuxbios_table_iterate: check_signature): Likewise.
* grub-core/kern/parser.c (grub_parser_split_cmdline:
check_varstate): Likewise.  Mark inline.
* grub-core/lib/arg.c (find_short: fnd_short): Likewise.  Pass
an additional parameter.
(find_long: fnd_long): Likewise.  Pass two additional parameters.
* grub-core/lib/crc.c (init_crc32c_table: reflect): Likewise.
* grub-core/lib/crc64.c (init_crc64_table: reflect): Likewise.
* grub-core/lib/ieee1275/cmos.c (grub_cmos_find_port: hook):
Likewise.  Rename to ...
(grub_cmos_find_port_iter): ... this.
* grub-core/lib/ieee1275/datetime.c (find_rtc: hook): Likewise.
Rename to ...
(find_rtc_iter): ... this.

* grub-core/normal/menu_entry.c (run): Fold nested editor_getsource
function directly into the function body, since it is only called
once.
This commit is contained in:
Colin Watson 2012-12-31 17:31:38 +00:00
parent 33a68ac643
commit 5c67ea6cd9
14 changed files with 273 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,25 +34,26 @@ static const struct grub_arg_option help_options[] =
{0, 0, 0, 0, 0, 0}
};
/* Helper for find_short. */
static struct grub_arg_option *
fnd_short (const struct grub_arg_option *opt, char c)
{
while (opt->doc)
{
if (opt->shortarg == c)
return (struct grub_arg_option *) opt;
opt++;
}
return 0;
}
static struct grub_arg_option *
find_short (const struct grub_arg_option *options, char c)
{
struct grub_arg_option *found = 0;
auto struct grub_arg_option *fnd_short (const struct grub_arg_option *opt);
struct grub_arg_option *fnd_short (const struct grub_arg_option *opt)
{
while (opt->doc)
{
if (opt->shortarg == c)
return (struct grub_arg_option *) opt;
opt++;
}
return 0;
}
if (options)
found = fnd_short (options);
found = fnd_short (options, c);
if (! found)
{
@ -74,29 +75,30 @@ find_short (const struct grub_arg_option *options, char c)
return found;
}
/* Helper for find_long. */
static struct grub_arg_option *
fnd_long (const struct grub_arg_option *opt, const char *s, int len)
{
while (opt->doc)
{
if (opt->longarg && ! grub_strncmp (opt->longarg, s, len) &&
opt->longarg[len] == '\0')
return (struct grub_arg_option *) opt;
opt++;
}
return 0;
}
static struct grub_arg_option *
find_long (const struct grub_arg_option *options, const char *s, int len)
{
struct grub_arg_option *found = 0;
auto struct grub_arg_option *fnd_long (const struct grub_arg_option *opt);
struct grub_arg_option *fnd_long (const struct grub_arg_option *opt)
{
while (opt->doc)
{
if (opt->longarg && ! grub_strncmp (opt->longarg, s, len) &&
opt->longarg[len] == '\0')
return (struct grub_arg_option *) opt;
opt++;
}
return 0;
}
if (options)
found = fnd_long (options);
found = fnd_long (options, s, len);
if (! found)
found = fnd_long (help_options);
found = fnd_long (help_options, s, len);
return found;
}