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/shared/ask-password-api.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/shared/ask-password-api.c')
-rw-r--r-- | src/shared/ask-password-api.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c index 0b1b9c6861..dc3d70bf1f 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -213,7 +213,7 @@ int ask_password_plymouth( char ***ret) { static const union sockaddr_union sa = PLYMOUTH_SOCKET; - _cleanup_close_ int fd = -1, notify = -1; + _cleanup_close_ int fd = -EBADF, notify = -EBADF; _cleanup_free_ char *packet = NULL; ssize_t k; int r, n; @@ -394,7 +394,7 @@ int ask_password_tty( }; bool reset_tty = false, dirty = false, use_color = false, press_tab_visible = false; - _cleanup_close_ int cttyfd = -1, notify = -1; + _cleanup_close_ int cttyfd = -EBADF, notify = -EBADF; struct termios old_termios, new_termios; char passphrase[LINE_MAX + 1] = {}, *x; _cleanup_strv_free_erase_ char **l = NULL; @@ -670,7 +670,7 @@ static int create_socket(char **ret) { _cleanup_free_ char *path = NULL; union sockaddr_union sa; socklen_t sa_len; - _cleanup_close_ int fd = -1; + _cleanup_close_ int fd = -EBADF; int r; assert(ret); @@ -715,7 +715,7 @@ int ask_password_agent( _FD_MAX }; - _cleanup_close_ int socket_fd = -1, signal_fd = -1, notify = -1, fd = -1; + _cleanup_close_ int socket_fd = -EBADF, signal_fd = -EBADF, notify = -EBADF, fd = -EBADF; char temp[] = "/run/systemd/ask-password/tmp.XXXXXX"; char final[sizeof(temp)] = ""; _cleanup_free_ char *socket_name = NULL; |