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

* grub-core/script/lexer.c (grub_script_lexer_init): Rename getline

Browse source 
to arg_getline to avoid shadowing.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-10 12:25:27 +01:00
parent 44d10dada6
commit 4f96abd198
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/script/lexer.c (grub_script_lexer_init): Rename getline
to arg_getline to avoid shadowing.
2012-02-10 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-10 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/partmap/gpt.c (gpt_partition_map_embed): Rename disk to * grub-core/partmap/gpt.c (gpt_partition_map_embed): Rename disk to

4
grub-core/script/lexer.c
View file

@ -209,7 +209,7 @@ grub_script_lexer_yywrap (struct grub_parser_param *parserstate,
struct grub_lexer_param * struct grub_lexer_param *
grub_script_lexer_init (struct grub_parser_param *parser, char *script, grub_script_lexer_init (struct grub_parser_param *parser, char *script,
grub_reader_getline_t getline) grub_reader_getline_t arg_getline)
{ {
struct grub_lexer_param *lexerstate; struct grub_lexer_param *lexerstate;
@ -225,7 +225,7 @@ grub_script_lexer_init (struct grub_parser_param *parser, char *script,
return 0; return 0;
} }
lexerstate->getline = getline; /* rest are all zeros already */ lexerstate->getline = arg_getline; /* rest are all zeros already */
if (yylex_init (&lexerstate->yyscanner)) if (yylex_init (&lexerstate->yyscanner))
{ {
grub_free (lexerstate->text); grub_free (lexerstate->text);