From 4a62c710b62a5a3c7a8a278b810b9d5b5a0c8f4f Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 28 Nov 2014 19:57:32 +0100 Subject: treewide: another round of simplifications Using the same scripts as in f647962d64e "treewide: yet more log_*_errno + return simplifications". --- src/shared/base-filesystem.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'src/shared/base-filesystem.c') diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c index b1f1f4190e..73907c6354 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c @@ -58,10 +58,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_errno(errno, "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 +93,15 @@ int base_filesystem_create(const char *root) { continue; r = symlinkat(target, fd, table[i].dir); - if (r < 0 && errno != EEXIST) { - log_error_errno(errno, "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_errno(errno, "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; -- cgit v1.2.3-54-g00ecf