parser: Refactor reading from file

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

diff --git a/src/pakfire/parser.c b/src/pakfire/parser.c
index e915ff2b07d3773d27a3616e35406d3fe93f33a5..85eeedba20b3023ef36d792ea0b7b4b85b524009 100644 (file)
--- a/src/pakfire/parser.c
+++ b/src/pakfire/parser.c
@@ -947,14 +947,22 @@ ERROR:
 
 int pakfire_parser_read_file(struct pakfire_parser* parser, const char* path,
                struct pakfire_parser_error** error) {
+       FILE* f = NULL;
+       int r;
+
        DEBUG(parser->ctx, "Parsing %s...\n", path);
 
-       FILE* f = fopen(path, "r");
+       // Open the file
+       f = fopen(path, "r");
        if (!f)
-               return 1;
+               return -errno;
+
+       // Run the parser
+       r = pakfire_parser_read(parser, f, error);
 
-       int r = pakfire_parser_read(parser, f, error);
-       fclose(f);
+       // Close the file
+       if (f)
+               fclose(f);
 
        return r;
 }