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-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=89536a0994568908cb905b9dda7497e02bf1f070;p=elogind.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 32d26c36d..96bcddb4f 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -44,6 +44,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,
@@ -250,8 +251,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;
                 }
@@ -409,7 +409,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);
@@ -432,7 +431,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;
-
                 }
         }