From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 12 Dec 2018 13:41:56 +0000 (+0100)
Subject: mount-setup: use FOREACH_STRING where appropriate
X-Git-Tag: v240~75^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4217b43d109095a55ae1cc8fb0a8a7e53cc039a;p=thirdparty%2Fsystemd.git

mount-setup: use FOREACH_STRING where appropriate
---

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index e773e17e1c4..231c7d80019 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -517,13 +517,13 @@ int mount_setup(bool loaded_policy) {
         if (loaded_policy) {
                 usec_t before_relabel, after_relabel;
                 char timespan[FORMAT_TIMESPAN_MAX];
+                const char *i;
                 int n_extra;
 
                 before_relabel = now(CLOCK_MONOTONIC);
 
-                (void) nftw("/dev", nftw_cb, 64, FTW_MOUNT|FTW_PHYS|FTW_ACTIONRETVAL);
-                (void) nftw("/dev/shm", nftw_cb, 64, FTW_MOUNT|FTW_PHYS|FTW_ACTIONRETVAL);
-                (void) nftw("/run", nftw_cb, 64, FTW_MOUNT|FTW_PHYS|FTW_ACTIONRETVAL);
+                FOREACH_STRING(i, "/dev", "/dev/shm", "/run")
+                        (void) nftw(i, nftw_cb, 64, FTW_MOUNT|FTW_PHYS|FTW_ACTIONRETVAL);
 
                 r = relabel_cgroup_filesystems();
                 if (r < 0)