X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fbase-filesystem.c;h=6bd317f354d40def56cf0a5349502e11eabe4623;hb=d6ce17c7f02ed3facdb45f65f546e587c2f00950;hp=4c65a495d3596a6732b0499ad0739aeee57322fa;hpb=6dc2852c643df4aa2580d42fc2d268bea0c5f57b;p=elogind.git

diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
index 4c65a495d..6bd317f35 100644
--- a/src/shared/base-filesystem.c
+++ b/src/shared/base-filesystem.c
@@ -22,17 +22,12 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <stdlib.h>
-#include <string.h>
-#include <assert.h>
 #include <unistd.h>
 
 #include "base-filesystem.h"
 #include "log.h"
 #include "macro.h"
-#include "strv.h"
 #include "util.h"
-#include "label.h"
-#include "mkdir.h"
 
 typedef struct BaseFilesystem {
         const char *dir;
@@ -58,10 +53,8 @@ int base_filesystem_create(const char *root) {
         int r;
 
         fd = open(root, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
-        if (fd < 0) {
-                log_error("Failed to open root file system: %m");
-                return -errno;
-        }
+        if (fd < 0)
+                return log_error_errno(errno, "Failed to open root file system: %m");
 
         for (i = 0; i < ELEMENTSOF(table); i ++) {
                 if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0)
@@ -95,19 +88,15 @@ int base_filesystem_create(const char *root) {
                                 continue;
 
                         r = symlinkat(target, fd, table[i].dir);
-                        if (r < 0 && errno != EEXIST) {
-                                log_error("Failed to create symlink at %s/%s: %m", root, table[i].dir);
-                                return -errno;
-                        }
+                        if (r < 0 && errno != EEXIST)
+                                return log_error_errno(errno, "Failed to create symlink at %s/%s: %m", root, table[i].dir);
                         continue;
                 }
 
                 RUN_WITH_UMASK(0000)
                         r = mkdirat(fd, table[i].dir, table[i].mode);
-                if (r < 0 && errno != EEXIST) {
-                        log_error("Failed to create directory at %s/%s: %m", root, table[i].dir);
-                        return -errno;
-                }
+                if (r < 0 && errno != EEXIST)
+                        return log_error_errno(errno, "Failed to create directory at %s/%s: %m", root, table[i].dir);
         }
 
         return 0;