X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fgrub2%2Fparser.y;h=a3473ca9051100df47bbe96a0062c6d9699e688c;hb=089d0a6eb769d531129a7cd1061493a1a24b4bef;hp=02ca7b2799f53f57bc9ef55f6dcfacbdae880a67;hpb=07fe1662d2a49f4e9e3c5b0451d141f69328262d;p=petitboot

diff --git a/discover/grub2/parser.y b/discover/grub2/parser.y
index 02ca7b2..a3473ca 100644
--- a/discover/grub2/parser.y
+++ b/discover/grub2/parser.y
@@ -6,17 +6,15 @@
 
 %{
 #include <talloc/talloc.h>
+#include <log/log.h>
 
 #include "grub2.h"
 #include "parser.h"
 #include "lexer.h"
 
-static void print_token(FILE *fp, int type, YYSTYPE value);
-
 #define YYLEX_PARAM parser->scanner
-#define YYPRINT(f, t, v) print_token(f, t, v)
 
-static void yyerror(struct grub2_parser *, char const *s);
+void yyerror(struct grub2_parser *parser, const char *fmt, ...);
 %}
 
 %union {
@@ -148,18 +146,17 @@ word:	TOKEN_WORD
 	}
 
 %%
-void yyerror(struct grub2_parser *parser, char const *s)
+void yyerror(struct grub2_parser *parser, const char *fmt, ...)
 {
-	fprintf(stderr, "%d: error: %s '%s'\n",
-			yyget_lineno(parser->scanner),
-			s, yyget_text(parser->scanner));
-}
+	const char *str;
+	va_list ap;
 
-static void print_token(FILE *fp, int type, YYSTYPE value)
-{
-	if (type != TOKEN_WORD)
-		return;
-	fprintf(fp, "%s", value.word->text);
+	va_start(ap, 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);
 }
 
 struct grub2_statements *create_statements(struct grub2_parser *parser)
@@ -312,6 +309,7 @@ void grub2_parser_parse(struct grub2_parser *parser, char *buf, int len)
 	int rc;
 
 	bufstate = yy_scan_bytes(buf, len - 1, parser->scanner);
+	yyset_lineno(1, parser->scanner);
 
 	rc = yyparse(parser);