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

	to arg_getline to avoid shadowing.

diff --git a/ChangeLog b/ChangeLog
index 90f24c274f9656baa5106fad290ef0820946a05e..1f75e0122d0bc551b27825dd2e70a0e733e49b7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * 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 a3c7f2a8bcb93b5d3bd819fe7af6138448cabbb6..54d33cfd56659acf789bb412bef7751b372f0734 100644 (file)
--- 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);