summaryrefslogtreecommitdiffstats
path: root/discover/grub2/grub2-parser.y
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2014-11-28 11:40:05 +0800
committerJeremy Kerr <jk@ozlabs.org>2014-12-01 11:53:23 +0800
commit6ad2eb0b495e47c5be35acd5d63d53530a45e137 (patch)
tree84370a900cc6733a645633dea56d4c1c8bd55bbd /discover/grub2/grub2-parser.y
parentbcb8d5ce5b43c1866b4520a1e8c4bd75ea141c58 (diff)
downloadtalos-petitboot-6ad2eb0b495e47c5be35acd5d63d53530a45e137.tar.gz
talos-petitboot-6ad2eb0b495e47c5be35acd5d63d53530a45e137.zip
discover/grub2: fix incorrect prototype in yyerror
Because we're using two parse-params, we need to add the scanner argument to yyerror. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover/grub2/grub2-parser.y')
-rw-r--r--discover/grub2/grub2-parser.y8
1 files changed, 4 insertions, 4 deletions
diff --git a/discover/grub2/grub2-parser.y b/discover/grub2/grub2-parser.y
index 4d351d4..7f9961b 100644
--- a/discover/grub2/grub2-parser.y
+++ b/discover/grub2/grub2-parser.y
@@ -11,7 +11,7 @@
#include "grub2.h"
-void yyerror(struct grub2_parser *parser, const char *fmt, ...);
+void yyerror(struct grub2_parser *parser, void *scanner, const char *fmt, ...);
%}
%union {
@@ -153,7 +153,7 @@ word: TOKEN_WORD
}
%%
-void yyerror(struct grub2_parser *parser, const char *fmt, ...)
+void yyerror(struct grub2_parser *parser, void *scanner, const char *fmt, ...)
{
const char *str;
va_list ap;
@@ -162,8 +162,8 @@ void yyerror(struct grub2_parser *parser, const char *fmt, ...)
str = talloc_vasprintf(parser, fmt, ap);
va_end(ap);
- pb_log("parse error: %d('%s'): %s\n", yyget_lineno(parser->scanner),
- yyget_text(parser->scanner), str);
+ pb_log("parse error: %d('%s'): %s\n", yyget_lineno(scanner),
+ yyget_text(scanner), str);
}
struct grub2_statements *create_statements(struct grub2_parser *parser)
OpenPOWER on IntegriCloud