parser: Initialize r on merge

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

diff --git a/src/libpakfire/parser.c b/src/libpakfire/parser.c
index 2f158942925b8969bce123c1fa7a67fa06ea7c42..01673c63b29204264c2da94f2f90b2ff8972d63f 100644 (file)
--- a/src/libpakfire/parser.c
+++ b/src/libpakfire/parser.c
@@ -816,18 +816,16 @@ int pakfire_parser_merge(struct pakfire_parser* parser1, struct pakfire_parser*
        struct pakfire_parser_declaration* d = NULL;
        char* namespace = NULL;
        char* value = NULL;
-       int r;
-
-       DEBUG(parser1->ctx, "Merging parsers %p and %p\n", parser1, parser2);
+       int r = 0;
 
-       if (!parser2) {
-               errno = EINVAL;
-               return 1;
-       }
+       if (!parser1 || !parser2)
+               return -EINVAL;
 
        // Do not try to merge a parser with itself
        if (parser1 == parser2)
-               return EINVAL;
+               return -EINVAL;
+
+       DEBUG(parser1->ctx, "Merging parsers %p and %p\n", parser1, parser2);
 
        for (unsigned int i = 0; i < parser2->num_declarations; i++) {
                d = parser2->declarations[i];