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

* util/grub-editenv.c (print_var): Rename name to varname to 

avoid shadowing.
	(main): Rename index to curindex to avoid shadowing.
	MAke filename a const char *.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-10 12:28:34 +01:00
parent 4f96abd198
commit 9a7428e638
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-editenv.c (print_var): Rename name to varname to
avoid shadowing.
(main): Rename index to curindex to avoid shadowing.
MAke filename a const char *.
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/script/lexer.c (grub_script_lexer_init): Rename getline

24
util/grub-editenv.c
View File

@ -191,10 +191,10 @@ list_variables (const char *name)
{
grub_envblk_t envblk;
auto int print_var (const char *name, const char *value);
int print_var (const char *name, const char *value)
auto int print_var (const char *varname, const char *value);
int print_var (const char *varname, const char *value)
{
printf ("%s=%s\n", name, value);
printf ("%s=%s\n", varname, value);
return 0;
}
@ -270,34 +270,34 @@ unset_variables (const char *name, int argc, char *argv[])
int
main (int argc, char *argv[])
{
char *filename;
const char *filename;
char *command;
int index, arg_count;
int curindex, arg_count;
set_program_name (argv[0]);
grub_util_init_nls ();
/* Parse our arguments */
if (argp_parse (&argp, argc, argv, 0, &index, 0) != 0)
if (argp_parse (&argp, argc, argv, 0, &curindex, 0) != 0)
{
fprintf (stderr, "%s", _("Error in parsing command line arguments\n"));
exit(1);
}
arg_count = argc - index;
arg_count = argc - curindex;
if (arg_count == 1)
{
filename = DEFAULT_ENVBLK_PATH;
command = argv[index++];
command = argv[curindex++];
}
else
{
filename = argv[index++];
filename = argv[curindex++];
if (strcmp (filename, "-") == 0)
filename = DEFAULT_ENVBLK_PATH;
command = argv[index++];
command = argv[curindex++];
}
if (strcmp (command, "create") == 0)
@ -305,9 +305,9 @@ main (int argc, char *argv[])
else if (strcmp (command, "list") == 0)
list_variables (filename);
else if (strcmp (command, "set") == 0)
set_variables (filename, argc - index, argv + index);
set_variables (filename, argc - curindex, argv + curindex);
else if (strcmp (command, "unset") == 0)
unset_variables (filename, argc - index, argv + index);
unset_variables (filename, argc - curindex, argv + curindex);
else
{
char *program = xstrdup(program_name);