add minimal logging framework

[elogind.git] / load-fragment.c

diff --git a/load-fragment.c b/load-fragment.c
index d6b5e2f397a9ff90f4453af5d1e2da443aeb38b1..ed96865248d106210163baea7f169a0b4741bc94 100644 (file)
--- a/load-fragment.c
+++ b/load-fragment.c
@@ -93,7 +93,7 @@ static int config_parse_names(
                                         return -EEXIST;
                                 }
 
-                                if ((r = name_merge(name, other) < 0)) {
+                                if ((r = name_merge(name, other)) < 0) {
                                         free(t);
                                         return r;
                                 }
@@ -111,6 +111,8 @@ static int config_parse_names(
                                 free(t);
                                 return r;
                         }
+
+                        t = NULL;
                 }
 
                 free(t);