util-lib: introduce dirent-util.[ch] for directory entry calls

[thirdparty/systemd.git] / src / basic / fdset.c

diff --git a/src/basic/fdset.c b/src/basic/fdset.c
index a4823e6659623602d71227929e797d83d87e38ef..4b11e4ea092013f58c6425c7c2d5481db9923f5b 100644 (file)
--- a/src/basic/fdset.c
+++ b/src/basic/fdset.c
@@ -23,11 +23,15 @@
 #include <dirent.h>
 #include <fcntl.h>
 
+#include "sd-daemon.h"
+
+#include "dirent-util.h"
+#include "fd-util.h"
+#include "fdset.h"
+#include "macro.h"
+#include "parse-util.h"
 #include "set.h"
 #include "util.h"
-#include "macro.h"
-#include "fdset.h"
-#include "sd-daemon.h"
 
 #define MAKE_SET(s) ((Set*) s)
 #define MAKE_FDSET(s) ((FDSet*) s)
@@ -201,9 +205,11 @@ int fdset_cloexec(FDSet *fds, bool b) {
 
         assert(fds);
 
-        SET_FOREACH(p, MAKE_SET(fds), i)
-                if ((r = fd_cloexec(PTR_TO_FD(p), b)) < 0)
+        SET_FOREACH(p, MAKE_SET(fds), i) {
+                r = fd_cloexec(PTR_TO_FD(p), b);
+                if (r < 0)
                         return r;
+        }
 
         return 0;
 }