chiark / gitweb /
load-fragment: a few modernizations
[elogind.git] / src / core / load-fragment.c
index 22da6c1..e0e42ac 100644 (file)
@@ -105,49 +105,6 @@ int config_parse_unit_deps(
         return 0;
 }
 
         return 0;
 }
 
-int config_parse_unit_names(
-                const char *filename,
-                unsigned line,
-                const char *section,
-                const char *lvalue,
-                int ltype,
-                const char *rvalue,
-                void *data,
-                void *userdata) {
-
-        Unit *u = userdata;
-        char *w;
-        size_t l;
-        char *state;
-
-        assert(filename);
-        assert(lvalue);
-        assert(rvalue);
-        assert(data);
-
-        FOREACH_WORD_QUOTED(w, l, rvalue, state) {
-                char *t, *k;
-                int r;
-
-                t = strndup(w, l);
-                if (!t)
-                        return -ENOMEM;
-
-                k = unit_name_printf(u, t);
-                free(t);
-                if (!k)
-                        return -ENOMEM;
-
-                r = unit_merge_by_name(u, k);
-                if (r < 0)
-                        log_error("Failed to add name %s, ignoring: %s", k, strerror(-r));
-
-                free(k);
-        }
-
-        return 0;
-}
-
 int config_parse_unit_string_printf(
                 const char *filename,
                 unsigned line,
 int config_parse_unit_string_printf(
                 const char *filename,
                 unsigned line,
@@ -2090,21 +2047,24 @@ static int open_follow(char **filename, FILE **_f, Set *names, char **_final) {
                 }
 
                 /* Try to open the file name, but don't if its a symlink */
                 }
 
                 /* Try to open the file name, but don't if its a symlink */
-                if ((fd = open(*filename, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW)) >= 0)
+                fd = open(*filename, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW);
+                if (fd >= 0)
                         break;
 
                 if (errno != ELOOP)
                         return -errno;
 
                 /* Hmm, so this is a symlink. Let's read the name, and follow it manually */
                         break;
 
                 if (errno != ELOOP)
                         return -errno;
 
                 /* Hmm, so this is a symlink. Let's read the name, and follow it manually */
-                if ((r = readlink_and_make_absolute(*filename, &target)) < 0)
+                r = readlink_and_make_absolute(*filename, &target);
+                if (r < 0)
                         return r;
 
                 free(*filename);
                 *filename = target;
         }
 
                         return r;
 
                 free(*filename);
                 *filename = target;
         }
 
-        if (!(f = fdopen(fd, "re"))) {
+        f = fdopen(fd, "re");
+        if (!f) {
                 r = -errno;
                 close_nointr_nofail(fd);
                 return r;
                 r = -errno;
                 close_nointr_nofail(fd);
                 return r;
@@ -2128,7 +2088,8 @@ static int merge_by_names(Unit **u, Set *names, const char *id) {
 
                 /* First try to merge in the other name into our
                  * unit */
 
                 /* First try to merge in the other name into our
                  * unit */
-                if ((r = unit_merge_by_name(*u, k)) < 0) {
+                r = unit_merge_by_name(*u, k);
+                if (r < 0) {
                         Unit *other;
 
                         /* Hmm, we couldn't merge the other unit into
                         Unit *other;
 
                         /* Hmm, we couldn't merge the other unit into
@@ -2138,11 +2099,13 @@ static int merge_by_names(Unit **u, Set *names, const char *id) {
                         other = manager_get_unit((*u)->manager, k);
                         free(k);
 
                         other = manager_get_unit((*u)->manager, k);
                         free(k);
 
-                        if (other)
-                                if ((r = unit_merge(other, *u)) >= 0) {
+                        if (other) {
+                                r = unit_merge(other, *u);
+                                if (r >= 0) {
                                         *u = other;
                                         return merge_by_names(u, names, NULL);
                                 }
                                         *u = other;
                                         return merge_by_names(u, names, NULL);
                                 }
+                        }
 
                         return r;
                 }
 
                         return r;
                 }
@@ -2173,12 +2136,14 @@ static int load_from_path(Unit *u, const char *path) {
 
         if (path_is_absolute(path)) {
 
 
         if (path_is_absolute(path)) {
 
-                if (!(filename = strdup(path))) {
+                filename = strdup(path);
+                if (!filename) {
                         r = -ENOMEM;
                         goto finish;
                 }
 
                         r = -ENOMEM;
                         goto finish;
                 }
 
-                if ((r = open_follow(&filename, &f, symlink_names, &id)) < 0) {
+                r = open_follow(&filename, &f, symlink_names, &id);
+                if (r < 0) {
                         free(filename);
                         filename = NULL;
 
                         free(filename);
                         filename = NULL;
 
@@ -2194,7 +2159,8 @@ static int load_from_path(Unit *u, const char *path) {
                         /* Instead of opening the path right away, we manually
                          * follow all symlinks and add their name to our unit
                          * name set while doing so */
                         /* Instead of opening the path right away, we manually
                          * follow all symlinks and add their name to our unit
                          * name set while doing so */
-                        if (!(filename = path_make_absolute(path, *p))) {
+                        filename = path_make_absolute(path, *p);
+                        if (!filename) {
                                 r = -ENOMEM;
                                 goto finish;
                         }
                                 r = -ENOMEM;
                                 goto finish;
                         }
@@ -2206,8 +2172,6 @@ static int load_from_path(Unit *u, const char *path) {
                                 r = open_follow(&filename, &f, symlink_names, &id);
 
                         if (r < 0) {
                                 r = open_follow(&filename, &f, symlink_names, &id);
 
                         if (r < 0) {
-                                char *sn;
-
                                 free(filename);
                                 filename = NULL;
 
                                 free(filename);
                                 filename = NULL;
 
@@ -2215,9 +2179,7 @@ static int load_from_path(Unit *u, const char *path) {
                                         goto finish;
 
                                 /* Empty the symlink names for the next run */
                                         goto finish;
 
                                 /* Empty the symlink names for the next run */
-                                while ((sn = set_steal_first(symlink_names)))
-                                        free(sn);
-
+                                set_clear_free(symlink_names);
                                 continue;
                         }
 
                                 continue;
                         }
 
@@ -2232,7 +2194,8 @@ static int load_from_path(Unit *u, const char *path) {
         }
 
         merged = u;
         }
 
         merged = u;
-        if ((r = merge_by_names(&merged, symlink_names, id)) < 0)
+        r = merge_by_names(&merged, symlink_names, id);
+        if (r < 0)
                 goto finish;
 
         if (merged != u) {
                 goto finish;
 
         if (merged != u) {
@@ -2295,7 +2258,8 @@ int unit_load_fragment(Unit *u) {
         /* First, try to find the unit under its id. We always look
          * for unit files in the default directories, to make it easy
          * to override things by placing things in /etc/systemd/system */
         /* First, try to find the unit under its id. We always look
          * for unit files in the default directories, to make it easy
          * to override things by placing things in /etc/systemd/system */
-        if ((r = load_from_path(u, u->id)) < 0)
+        r = load_from_path(u, u->id);
+        if (r < 0)
                 return r;
 
         /* Try to find an alias we can load this with */
                 return r;
 
         /* Try to find an alias we can load this with */
@@ -2305,7 +2269,8 @@ int unit_load_fragment(Unit *u) {
                         if (t == u->id)
                                 continue;
 
                         if (t == u->id)
                                 continue;
 
-                        if ((r = load_from_path(u, t)) < 0)
+                        r = load_from_path(u, t);
+                        if (r < 0)
                                 return r;
 
                         if (u->load_state != UNIT_STUB)
                                 return r;
 
                         if (u->load_state != UNIT_STUB)
@@ -2315,7 +2280,8 @@ int unit_load_fragment(Unit *u) {
         /* And now, try looking for it under the suggested (originally linked) path */
         if (u->load_state == UNIT_STUB && u->fragment_path) {
 
         /* And now, try looking for it under the suggested (originally linked) path */
         if (u->load_state == UNIT_STUB && u->fragment_path) {
 
-                if ((r = load_from_path(u, u->fragment_path)) < 0)
+                r = load_from_path(u, u->fragment_path);
+                if (r < 0)
                         return r;
 
                 if (u->load_state == UNIT_STUB) {
                         return r;
 
                 if (u->load_state == UNIT_STUB) {
@@ -2331,7 +2297,8 @@ int unit_load_fragment(Unit *u) {
         if (u->load_state == UNIT_STUB && u->instance) {
                 char *k;
 
         if (u->load_state == UNIT_STUB && u->instance) {
                 char *k;
 
-                if (!(k = unit_name_template(u->id)))
+                k = unit_name_template(u->id);
+                if (!k)
                         return -ENOMEM;
 
                 r = load_from_path(u, k);
                         return -ENOMEM;
 
                 r = load_from_path(u, k);
@@ -2346,7 +2313,8 @@ int unit_load_fragment(Unit *u) {
                                 if (t == u->id)
                                         continue;
 
                                 if (t == u->id)
                                         continue;
 
-                                if (!(k = unit_name_template(t)))
+                                k = unit_name_template(t);
+                                if (!k)
                                         return -ENOMEM;
 
                                 r = load_from_path(u, k);
                                         return -ENOMEM;
 
                                 r = load_from_path(u, k);
@@ -2395,7 +2363,6 @@ void unit_dump_config_items(FILE *f) {
                 { config_parse_limit,                 "LIMIT" },
                 { config_parse_unit_cgroup,           "CGROUP [...]" },
                 { config_parse_unit_deps,             "UNIT [...]" },
                 { config_parse_limit,                 "LIMIT" },
                 { config_parse_unit_cgroup,           "CGROUP [...]" },
                 { config_parse_unit_deps,             "UNIT [...]" },
-                { config_parse_unit_names,            "UNIT [...]" },
                 { config_parse_exec,                  "PATH [ARGUMENT [...]]" },
                 { config_parse_service_type,          "SERVICETYPE" },
                 { config_parse_service_restart,       "SERVICERESTART" },
                 { config_parse_exec,                  "PATH [ARGUMENT [...]]" },
                 { config_parse_service_type,          "SERVICETYPE" },
                 { config_parse_service_restart,       "SERVICERESTART" },