diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-12-19 13:07:42 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-12-19 15:00:57 +0100 |
commit | 254d1313ae5a69c08c9b93032aaaf3d6083cfc07 (patch) | |
tree | 067102a36abe6bf597c26a42d79018a1060c9007 /src/basic/mkdir.c | |
parent | cbff793ffb280d9d11e5d7b1dc3964276491bee8 (diff) | |
download | systemd-254d1313ae5a69c08c9b93032aaaf3d6083cfc07.tar.gz |
tree-wide: use -EBADF for fd initialization
-1 was used everywhere, but -EBADF or -EBADFD started being used in various
places. Let's make things consistent in the new style.
Note that there are two candidates:
EBADF 9 Bad file descriptor
EBADFD 77 File descriptor in bad state
Since we're initializating the fd, we're just assigning a value that means
"no fd yet", so it's just a bad file descriptor, and the first errno fits
better. If instead we had a valid file descriptor that became invalid because
of some operation or state change, the other errno would fit better.
In some places, initialization is dropped if unnecessary.
Diffstat (limited to 'src/basic/mkdir.c')
-rw-r--r-- | src/basic/mkdir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c index 6796d4aeda..7ad19ee33b 100644 --- a/src/basic/mkdir.c +++ b/src/basic/mkdir.c @@ -211,7 +211,7 @@ int mkdir_p_safe(const char *prefix, const char *path, mode_t mode, uid_t uid, g int mkdir_p_root(const char *root, const char *p, uid_t uid, gid_t gid, mode_t m) { _cleanup_free_ char *pp = NULL, *bn = NULL; - _cleanup_close_ int dfd = -1; + _cleanup_close_ int dfd = -EBADF; int r; r = path_extract_directory(p, &pp); @@ -250,7 +250,7 @@ int mkdir_p_root(const char *root, const char *p, uid_t uid, gid_t gid, mode_t m } if (uid_is_valid(uid) || gid_is_valid(gid)) { - _cleanup_close_ int nfd = -1; + _cleanup_close_ int nfd = -EBADF; nfd = openat(dfd, bn, O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOFOLLOW); if (nfd < 0) |