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/home/homework-mount.c | |
parent | sd-event: never pass negative errnos as signalfd to signalfd (diff) | |
download | systemd-254d1313ae5a69c08c9b93032aaaf3d6083cfc07.tar.xz systemd-254d1313ae5a69c08c9b93032aaaf3d6083cfc07.zip |
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/home/homework-mount.c')
-rw-r--r-- | src/home/homework-mount.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/home/homework-mount.c b/src/home/homework-mount.c index cd03f79a73..cf42a0b94d 100644 --- a/src/home/homework-mount.c +++ b/src/home/homework-mount.c @@ -186,7 +186,7 @@ static int append_identity_range(char **text, uid_t start, uid_t next_start, uid static int make_userns(uid_t stored_uid, uid_t exposed_uid) { _cleanup_free_ char *text = NULL; - _cleanup_close_ int userns_fd = -1; + _cleanup_close_ int userns_fd = -EBADF; int r; assert(uid_is_valid(stored_uid)); @@ -238,7 +238,7 @@ static int make_userns(uid_t stored_uid, uid_t exposed_uid) { } int home_shift_uid(int dir_fd, const char *target, uid_t stored_uid, uid_t exposed_uid, int *ret_mount_fd) { - _cleanup_close_ int mount_fd = -1, userns_fd = -1; + _cleanup_close_ int mount_fd = -EBADF, userns_fd = -EBADF; int r; assert(dir_fd >= 0); @@ -261,7 +261,7 @@ int home_shift_uid(int dir_fd, const char *target, uid_t stored_uid, uid_t expos log_debug_errno(errno, "The open_tree() syscall is not supported, not setting up UID shift mount: %m"); if (ret_mount_fd) - *ret_mount_fd = -1; + *ret_mount_fd = -EBADF; return 0; } @@ -284,7 +284,7 @@ int home_shift_uid(int dir_fd, const char *target, uid_t stored_uid, uid_t expos log_debug_errno(errno, "UID/GID mapping for shifted mount not available, not setting it up: %m"); if (ret_mount_fd) - *ret_mount_fd = -1; + *ret_mount_fd = -EBADF; return 0; } |