chiark / gitweb /
swap: simplify a few things by making use of new LIST_FOREACH_OTHERS macro
authorLennart Poettering <lennart@poettering.net>
Tue, 27 Jan 2015 23:37:11 +0000 (00:37 +0100)
committerLennart Poettering <lennart@poettering.net>
Tue, 27 Jan 2015 23:37:11 +0000 (00:37 +0100)
src/core/swap.c

index cc03b14..b97f102 100644 (file)
@@ -1178,11 +1178,7 @@ static Unit *swap_following(Unit *u) {
         if (s->from_fragment)
                 return NULL;
 
-        LIST_FOREACH_AFTER(same_devnode, other, s)
-                if (other->from_fragment)
-                        return UNIT(other);
-
-        LIST_FOREACH_BEFORE(same_devnode, other, s)
+        LIST_FOREACH_OTHERS(same_devnode, other, s)
                 if (other->from_fragment)
                         return UNIT(other);
 
@@ -1224,13 +1220,7 @@ static int swap_following_set(Unit *u, Set **_set) {
         if (!set)
                 return -ENOMEM;
 
-        LIST_FOREACH_AFTER(same_devnode, other, s) {
-                r = set_put(set, other);
-                if (r < 0)
-                        goto fail;
-        }
-
-        LIST_FOREACH_BEFORE(same_devnode, other, s) {
+        LIST_FOREACH_OTHERS(same_devnode, other, s) {
                 r = set_put(set, other);
                 if (r < 0)
                         goto fail;