|
 |
a5bd9f6 |
From 60c3912bdb7a4dcc6fed286d18d8ce83d4f9b132 Mon Sep 17 00:00:00 2001
|
|
|
a5bd9f6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
Date: Wed, 16 Jan 2013 09:06:11 +0100
|
|
|
a5bd9f6 |
Subject: [PATCH 108/364] * grub-core/script/lexer.c
|
|
|
a5bd9f6 |
(grub_script_lexer_init): Rename getline argument to prevent name
|
|
|
a5bd9f6 |
collision.
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
---
|
|
|
a5bd9f6 |
ChangeLog | 5 +++++
|
|
|
a5bd9f6 |
grub-core/script/lexer.c | 4 ++--
|
|
|
a5bd9f6 |
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
a5bd9f6 |
index d02749b..76a9f68 100644
|
|
|
a5bd9f6 |
--- a/ChangeLog
|
|
|
a5bd9f6 |
+++ b/ChangeLog
|
|
|
a5bd9f6 |
@@ -1,3 +1,8 @@
|
|
|
a5bd9f6 |
+2013-01-16 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
+ * grub-core/script/lexer.c (grub_script_lexer_init): Rename getline
|
|
|
a5bd9f6 |
+ argument to prevent name collision.
|
|
|
a5bd9f6 |
+
|
|
|
a5bd9f6 |
2013-01-15 Colin Watson <cjwatson@ubuntu.com>
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
Remove nested functions from script reading and parsing.
|
|
|
a5bd9f6 |
diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c
|
|
|
a5bd9f6 |
index cb9d6b0..128d238 100644
|
|
|
a5bd9f6 |
--- a/grub-core/script/lexer.c
|
|
|
a5bd9f6 |
+++ b/grub-core/script/lexer.c
|
|
|
a5bd9f6 |
@@ -216,7 +216,7 @@ grub_script_lexer_yywrap (struct grub_parser_param *parserstate,
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
struct grub_lexer_param *
|
|
|
a5bd9f6 |
grub_script_lexer_init (struct grub_parser_param *parser, char *script,
|
|
|
a5bd9f6 |
- grub_reader_getline_t getline, void *getline_data)
|
|
|
a5bd9f6 |
+ grub_reader_getline_t arg_getline, void *getline_data)
|
|
|
a5bd9f6 |
{
|
|
|
a5bd9f6 |
struct grub_lexer_param *lexerstate;
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
@@ -232,7 +232,7 @@ grub_script_lexer_init (struct grub_parser_param *parser, char *script,
|
|
|
a5bd9f6 |
return 0;
|
|
|
a5bd9f6 |
}
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
- lexerstate->getline = getline;
|
|
|
a5bd9f6 |
+ lexerstate->getline = arg_getline;
|
|
|
a5bd9f6 |
lexerstate->getline_data = getline_data;
|
|
|
a5bd9f6 |
/* The other elements of lexerstate are all zeros already. */
|
|
|
a5bd9f6 |
|
|
|
a5bd9f6 |
--
|
|
|
a5bd9f6 |
1.8.1.4
|
|
|
a5bd9f6 |
|