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/tty-ask-password-agent | |
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/tty-ask-password-agent')
-rw-r--r-- | src/tty-ask-password-agent/tty-ask-password-agent.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c index c7609d7d79..9166e1f9ec 100644 --- a/src/tty-ask-password-agent/tty-ask-password-agent.c +++ b/src/tty-ask-password-agent/tty-ask-password-agent.c @@ -56,7 +56,7 @@ static const char *arg_device = NULL; static int send_passwords(const char *socket_name, char **passwords) { _cleanup_(erase_and_freep) char *packet = NULL; - _cleanup_close_ int socket_fd = -1; + _cleanup_close_ int socket_fd = -EBADF; union sockaddr_union sa; socklen_t sa_len; size_t packet_length = 1; @@ -97,7 +97,7 @@ static int send_passwords(const char *socket_name, char **passwords) { static bool wall_tty_match(const char *path, bool is_local, void *userdata) { _cleanup_free_ char *p = NULL; - _cleanup_close_ int fd = -1; + _cleanup_close_ int fd = -EBADF; struct stat st; assert(path_is_absolute(path)); @@ -142,7 +142,7 @@ static int agent_ask_password_tty( const char *flag_file, char ***ret) { - int tty_fd = -1, r; + int tty_fd = -EBADF, r; const char *con = arg_device ?: "/dev/console"; if (arg_console) { @@ -337,8 +337,8 @@ static int process_and_watch_password_files(bool watch) { _FD_MAX }; - _unused_ _cleanup_close_ int tty_block_fd = -1; - _cleanup_close_ int notify = -1, signal_fd = -1; + _unused_ _cleanup_close_ int tty_block_fd = -EBADF; + _cleanup_close_ int notify = -1, signal_fd = -EBADF; struct pollfd pollfd[_FD_MAX]; sigset_t mask; int r; |