From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 27 Jan 2015 23:37:11 +0000 (+0100)
Subject: swap: simplify a few things by making use of new LIST_FOREACH_OTHERS macro
X-Git-Tag: v219~258
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=caac2704d57ef6d95f7053456479353bae3638de;p=elogind.git

swap: simplify a few things by making use of new LIST_FOREACH_OTHERS macro
---

diff --git a/src/core/swap.c b/src/core/swap.c
index cc03b14e7..b97f102d6 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -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;