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 
argument to prevent name collision.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-01-16 09:06:11 +01:00
parent 09fd6d8293
commit 4542e71b8b
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 @@
2013-01-16 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/script/lexer.c (grub_script_lexer_init): Rename getline
argument to prevent name collision.
2013-01-15 Colin Watson <cjwatson@ubuntu.com>
Remove nested functions from script reading and parsing.

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

@ -216,7 +216,7 @@ grub_script_lexer_yywrap (struct grub_parser_param *parserstate,
struct grub_lexer_param *
grub_script_lexer_init (struct grub_parser_param *parser, char *script,
grub_reader_getline_t getline, void *getline_data)
grub_reader_getline_t arg_getline, void *getline_data)
{
struct grub_lexer_param *lexerstate;
@ -232,7 +232,7 @@ grub_script_lexer_init (struct grub_parser_param *parser, char *script,
return 0;
}
lexerstate->getline = getline;
lexerstate->getline = arg_getline;
lexerstate->getline_data = getline_data;
/* The other elements of lexerstate are all zeros already. */