util: fix FOREACH_WORD macro definitions

[elogind.git] / load-fragment.c

diff --git a/load-fragment.c b/load-fragment.c
index 64e66f314ef44e576114cb9bccb5bffe82867ccd..e2c04e26beebb7faefcfc81a697fe6762a752b03 100644 (file)
--- a/load-fragment.c
+++ b/load-fragment.c
@@ -56,7 +56,7 @@ static int config_parse_deps(
         assert(lvalue);
         assert(rvalue);
 
-        FOREACH_WORD(w, &l, rvalue, state) {
+        FOREACH_WORD(w, l, rvalue, state) {
                 char *t;
                 int r;
 
@@ -92,7 +92,7 @@ static int config_parse_names(
         assert(rvalue);
         assert(data);
 
-        FOREACH_WORD(w, &l, rvalue, state) {
+        FOREACH_WORD(w, l, rvalue, state) {
                 char *t;
                 int r;
                 Unit *other;
@@ -328,7 +328,7 @@ static int config_parse_exec(
                 void *data,
                 void *userdata) {
 
-        ExecCommand **e = data, *ee, *nce = NULL;
+        ExecCommand **e = data, *nce = NULL;
         char **n;
         char *w;
         unsigned k;
@@ -367,12 +367,7 @@ static int config_parse_exec(
         if (!(nce->path = strdup(n[0])))
                 goto fail;
 
-        if (*e) {
-                /* It's kinda important that we keep the order here */
-                LIST_FIND_TAIL(ExecCommand, command, *e, ee);
-                LIST_INSERT_AFTER(ExecCommand, command, *e, ee, nce);
-        } else
-                *e = nce;
+        exec_command_append_list(e, nce);
 
         return 0;
 
@@ -751,7 +746,7 @@ static int config_parse_cpu_affinity(
         assert(rvalue);
         assert(data);
 
-        FOREACH_WORD(w, &l, rvalue, state) {
+        FOREACH_WORD(w, l, rvalue, state) {
                 char *t;
                 int r;
                 unsigned cpu;
@@ -826,7 +821,7 @@ static int config_parse_secure_bits(
         assert(rvalue);
         assert(data);
 
-        FOREACH_WORD(w, &l, rvalue, state) {
+        FOREACH_WORD(w, l, rvalue, state) {
                 if (first_word(w, "keep-caps"))
                         c->secure_bits |= SECURE_KEEP_CAPS;
                 else if (first_word(w, "keep-caps-locked"))
@@ -867,7 +862,7 @@ static int config_parse_bounding_set(
         assert(rvalue);
         assert(data);
 
-        FOREACH_WORD(w, &l, rvalue, state) {
+        FOREACH_WORD(w, l, rvalue, state) {
                 char *t;
                 int r;
                 cap_value_t cap;
@@ -1207,8 +1202,8 @@ static int load_from_path(Unit *u, const char *path) {
         }
 
 
-        free(u->meta.load_path);
-        u->meta.load_path = filename;
+        free(u->meta.fragment_path);
+        u->meta.fragment_path = filename;
         filename = NULL;
 
         r = 1; /* returning 1 means: suitable config file found and loaded */
@@ -1229,8 +1224,8 @@ int unit_load_fragment(Unit *u) {
         assert(u);
         assert(u->meta.load_state == UNIT_STUB);
 
-        if (u->meta.load_path)
-                r = load_from_path(u, u->meta.load_path);
+        if (u->meta.fragment_path)
+                r = load_from_path(u, u->meta.fragment_path);
         else {
                 Iterator i;
                 char *t;