summaryrefslogtreecommitdiff
path: root/src/shared/conf-parser.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-06-04 21:27:57 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-06-13 13:50:35 +0900
commit8e7b5bd0470a2bef5c9876f4924d028b1dba3367 (patch)
tree43037cabfea8fa69ab2cd66b55751bb108bc7962 /src/shared/conf-parser.c
parentdbc4661a2c527ead70445bfd8f1fa47e2c4971a8 (diff)
downloadsystemd-8e7b5bd0470a2bef5c9876f4924d028b1dba3367.tar.gz
conf-parser: simplify conf_parse_path()
Follow-up for 97651797e83d0548aef9f808657d3518d89e5aee.
Diffstat (limited to 'src/shared/conf-parser.c')
-rw-r--r--src/shared/conf-parser.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 29dd1ddc88..4a41b814ae 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -716,10 +716,8 @@ int config_parse_path(
assert(rvalue);
assert(data);
- if (isempty(rvalue)) {
- n = NULL;
+ if (isempty(rvalue))
goto finalize;
- }
n = strdup(rvalue);
if (!n)
@@ -730,9 +728,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(