From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 4 Jun 2018 12:27:57 +0000 (+0900)
Subject: conf-parser: simplify conf_parse_path()
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d15590d95222526bf9eecfe8d0b8485b51e018c6;p=elogind.git

conf-parser: simplify conf_parse_path()

Follow-up for 97651797e83d0548aef9f808657d3518d89e5aee.
---

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 133d8f62c..db74a7fdb 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -49,6 +49,7 @@
 //#include "rlimit-util.h"
 //#include "rlimit-util.h"
 //#include "rlimit-util.h"
+//#include "rlimit-util.h"
 
 int config_item_table_lookup(
                 const void *table,
@@ -741,10 +742,8 @@ int config_parse_path(
         assert(rvalue);
         assert(data);
 
-        if (isempty(rvalue)) {
-                n = NULL;
+        if (isempty(rvalue))
                 goto finalize;
-        }
 
         n = strdup(rvalue);
         if (!n)
@@ -755,9 +754,7 @@ int config_parse_path(
                 return fatal ? -ENOEXEC : 0;
 
 finalize:
-        free_and_replace(*s, n);
-
-        return 0;
+        return free_and_replace(*s, n);
 }
 
 int config_parse_strv(