From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 7 Jul 2014 21:03:17 +0000 (+0200)
Subject: resolved: let config_parse() open the configuration file for us
X-Git-Tag: v216~712
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=987d561fe202568c0a2880cf047c7833fd365c7a

resolved: let config_parse() open the configuration file for us
---

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 3ed0603f9..0e2b85b5a 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -97,23 +97,13 @@ int config_parse_dnsv(
 }
 
 static int manager_parse_config_file(Manager *m) {
-        static const char fn[] = "/etc/systemd/resolved.conf";
-        _cleanup_fclose_ FILE *f = NULL;
         int r;
 
         assert(m);
 
-        f = fopen(fn, "re");
-        if (!f) {
-                if (errno == ENOENT)
-                        return 0;
-
-                log_warning("Failed to open configuration file %s: %m", fn);
-                return -errno;
-        }
-
-        r = config_parse(NULL, fn, f, "Resolve\0", config_item_perf_lookup,
-                         (void*) resolved_gperf_lookup, false, false, m);
+        r = config_parse(NULL, "/etc/systemd/resolved.conf", NULL,
+                         "Resolve\0", config_item_perf_lookup, (void*) resolved_gperf_lookup,
+                         false, false, m);
         if (r < 0)
                 log_warning("Failed to parse configuration file: %s", strerror(-r));