diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-07-23 10:10:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-23 10:10:53 +0200 |
| commit | 1415e04603b7c243d70a70231d7d3eb184224597 (patch) | |
| tree | fc4f6bef0fb8782665a90f015eacdb13e949cab4 /src/tmpfiles/tmpfiles.c | |
| parent | 771de3f506ac5b9f5846acae70d8e558d969d018 (diff) | |
| parent | 476b8254d95488d09eebdbd175494aaafac23a3e (diff) | |
Merge pull request #3785 from keszybz/less-return-errno
Use "return log_error_errno(...)" in more places + related fixes
Diffstat (limited to 'src/tmpfiles/tmpfiles.c')
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index bfb6293b3d..954f4aa985 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -1575,13 +1575,12 @@ static int clean_item_instance(Item *i, const char* instance) { d = opendir_nomod(instance); if (!d) { - if (errno == ENOENT || errno == ENOTDIR) { + if (IN_SET(errno, ENOENT, ENOTDIR)) { log_debug_errno(errno, "Directory \"%s\": %m", instance); return 0; } - log_error_errno(errno, "Failed to open directory %s: %m", instance); - return -errno; + return log_error_errno(errno, "Failed to open directory %s: %m", instance); } if (fstat(dirfd(d), &s) < 0) |