From 4f96abd198c16cd8c6a738f491c8e75974a82cf8 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 10 Feb 2012 12:25:27 +0100 Subject: [PATCH] * grub-core/script/lexer.c (grub_script_lexer_init): Rename getline to arg_getline to avoid shadowing. --- ChangeLog | 5 +++++ grub-core/script/lexer.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90f24c274..1f75e0122 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-02-10 Vladimir Serbinenko + + * grub-core/script/lexer.c (grub_script_lexer_init): Rename getline + to arg_getline to avoid shadowing. + 2012-02-10 Vladimir Serbinenko * grub-core/partmap/gpt.c (gpt_partition_map_embed): Rename disk to diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c index a3c7f2a8b..54d33cfd5 100644 --- a/grub-core/script/lexer.c +++ b/grub-core/script/lexer.c @@ -209,7 +209,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) + grub_reader_getline_t arg_getline) { struct grub_lexer_param *lexerstate; @@ -225,7 +225,7 @@ grub_script_lexer_init (struct grub_parser_param *parser, char *script, return 0; } - lexerstate->getline = getline; /* rest are all zeros already */ + lexerstate->getline = arg_getline; /* rest are all zeros already */ if (yylex_init (&lexerstate->yyscanner)) { grub_free (lexerstate->text);