From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 3 Jun 2018 15:30:36 +0000 (+0900)
Subject: conf-parse: use free_and_replace()
X-Git-Tag: v239~161^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97b9c506cf07be74c5771fc624c1e8bb05fd2eab;p=thirdparty%2Fsystemd.git

conf-parse: use free_and_replace()

Also removes unnecessary empty lines.
---

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 159b923e9c8..1057c59a110 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -240,8 +240,7 @@ static int parse_line(
                         *section_line = 0;
                         *section_ignored = true;
                 } else {
-                        free(*section);
-                        *section = n;
+                        free_and_replace(*section, n);
                         *section_line = line;
                         *section_ignored = false;
                 }
@@ -399,7 +398,6 @@ int config_parse(const char *unit,
                         if (flags & CONFIG_PARSE_WARN)
                                 log_warning_errno(r, "%s:%u: Failed to parse file: %m", filename, line);
                         return r;
-
                 }
 
                 continuation = mfree(continuation);
@@ -422,7 +420,6 @@ int config_parse(const char *unit,
                         if (flags & CONFIG_PARSE_WARN)
                                 log_warning_errno(r, "%s:%u: Failed to parse file: %m", filename, line);
                         return r;
-
                 }
         }