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/userdb | |
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/userdb')
-rw-r--r-- | src/userdb/userdbctl.c | 2 | ||||
-rw-r--r-- | src/userdb/userdbd-manager.c | 2 | ||||
-rw-r--r-- | src/userdb/userwork.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c index 49bdaf666f..b728cdc1c3 100644 --- a/src/userdb/userdbctl.c +++ b/src/userdb/userdbctl.c @@ -931,7 +931,7 @@ static int display_services(int argc, char *argv[], void *userdata) { FOREACH_DIRENT(de, d, return -errno) { _cleanup_free_ char *j = NULL, *no = NULL; - _cleanup_close_ int fd = -1; + _cleanup_close_ int fd = -EBADF; j = path_join("/run/systemd/userdb/", de->d_name); if (!j) diff --git a/src/userdb/userdbd-manager.c b/src/userdb/userdbd-manager.c index 81d3f6407c..7890d047c4 100644 --- a/src/userdb/userdbd-manager.c +++ b/src/userdb/userdbd-manager.c @@ -83,7 +83,7 @@ int manager_new(Manager **ret) { return -ENOMEM; *m = (Manager) { - .listen_fd = -1, + .listen_fd = -EBADF, .worker_ratelimit = { .interval = 5 * USEC_PER_SEC, .burst = 50, diff --git a/src/userdb/userwork.c b/src/userdb/userwork.c index 21a869df1b..9fccadc950 100644 --- a/src/userdb/userwork.c +++ b/src/userdb/userwork.c @@ -503,7 +503,7 @@ static int run(int argc, char *argv[]) { start_time = now(CLOCK_MONOTONIC); for (;;) { - _cleanup_close_ int fd = -1; + _cleanup_close_ int fd = -EBADF; usec_t n; /* Exit the worker in regular intervals, to flush out all memory use */ |