From 8e7b5bd0470a2bef5c9876f4924d028b1dba3367 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 4 Jun 2018 21:27:57 +0900 Subject: [PATCH] conf-parser: simplify conf_parse_path() Follow-up for 97651797e83d0548aef9f808657d3518d89e5aee. --- src/shared/conf-parser.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 29dd1dd..4a41b81 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( -- 2.7.4