dbus: introduce UnsetAndSetEnvironment()

[elogind.git] / src / util.c

diff --git a/src/util.c b/src/util.c
index 156d32a2e0c7dd664f20b095482655e6192baab4..81d247ca46d00a7a8981b8138bd87125a270a22e 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -230,11 +230,12 @@ int close_nointr(int fd) {
         for (;;) {
                 int r;
 
-                if ((r = close(fd)) >= 0)
+                r = close(fd);
+                if (r >= 0)
                         return r;
 
                 if (errno != EINTR)
-                        return r;
+                        return -errno;
         }
 }
 
@@ -4691,6 +4692,7 @@ int conf_files_list(char ***strv, const char *suffix, const char *dir, ...) {
         }
 
         qsort(files, hashmap_size(fh), sizeof(char *), base_cmp);
+
 finish:
         strv_free(dirs);
         hashmap_free(fh);