]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
cgtop: use FOREACH_STRING() for fun and profit
authorLennart Poettering <lennart@poettering.net>
Thu, 15 Nov 2018 19:08:17 +0000 (20:08 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 16 Nov 2018 13:46:49 +0000 (14:46 +0100)
src/cgtop/cgtop.c

index cf2de7eb5a8d111445fc64f9e7dd15a6428cd863..efbfd240a6bfd05b2d6dca833b349ca070640021 100644 (file)
@@ -501,31 +501,14 @@ static int refresh_one(
 }
 
 static int refresh(const char *root, Hashmap *a, Hashmap *b, unsigned iteration) {
+        const char *c;
         int r;
 
-        assert(a);
-
-        r = refresh_one(SYSTEMD_CGROUP_CONTROLLER, root, a, b, iteration, 0, NULL);
-        if (r < 0)
-                return r;
-        r = refresh_one("cpu", root, a, b, iteration, 0, NULL);
-        if (r < 0)
-                return r;
-        r = refresh_one("cpuacct", root, a, b, iteration, 0, NULL);
-        if (r < 0)
-                return r;
-        r = refresh_one("memory", root, a, b, iteration, 0, NULL);
-        if (r < 0)
-                return r;
-        r = refresh_one("io", root, a, b, iteration, 0, NULL);
-        if (r < 0)
-                return r;
-        r = refresh_one("blkio", root, a, b, iteration, 0, NULL);
-        if (r < 0)
-                return r;
-        r = refresh_one("pids", root, a, b, iteration, 0, NULL);
-        if (r < 0)
-                return r;
+        FOREACH_STRING(c, SYSTEMD_CGROUP_CONTROLLER, "cpu", "cpuacct", "memory", "io", "blkio", "pids") {
+                r = refresh_one(c, root, a, b, iteration, 0, NULL);
+                if (r < 0)
+                        return r;
+        }
 
         return 0;
 }