From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 9 Mar 2019 18:53:33 +0000 (+0000)
Subject: libpakfire: parser: Use our own logging mechanism for error messages
X-Git-Tag: 0.9.28~1285^2~1102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e98f46a79181e5b393bf797f86b2f53b6d88813f;p=pakfire.git

libpakfire: parser: Use our own logging mechanism for error messages

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/parser/grammar.y b/src/libpakfire/parser/grammar.y
index ef8e32b3d..c8cbd27ed 100644
--- a/src/libpakfire/parser/grammar.y
+++ b/src/libpakfire/parser/grammar.y
@@ -19,9 +19,6 @@
 #############################################################################*/
 
 %{
-#include <stdio.h>
-#include <stdlib.h>
-
 #include <pakfire/logging.h>
 #include <pakfire/types.h>
 
@@ -33,10 +30,10 @@ extern void yy_delete_buffer(YY_BUFFER_STATE buffer);
 
 extern int yylex();
 extern int yyparse();
-void yyerror(const char* s);
 
 extern int num_lines;
-
+static Pakfire pakfire;
+static void yyerror(const char* s);
 %}
 
 %token APPEND
@@ -55,7 +52,9 @@ top: NEWLINE
 
 %%
 
-int pakfire_parser_parse_metadata(Pakfire pakfire, const char* data, size_t len) {
+int pakfire_parser_parse_metadata(Pakfire _pakfire, const char* data, size_t len) {
+	pakfire = _pakfire;
+
 	DEBUG(pakfire, "Parsing the following data:\n%s\n", data);
 
 	num_lines = 1;
@@ -68,5 +67,5 @@ int pakfire_parser_parse_metadata(Pakfire pakfire, const char* data, size_t len)
 }
 
 void yyerror(const char* s) {
-	fprintf(stderr, "Error (line %d): %s\n", num_lines, s);
+	ERROR(pakfire, "Error (line %d): %s\n", num_lines, s);
 }