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/oom | |
| 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/oom')
| -rw-r--r-- | src/oom/oomctl.c | 2 | ||||
| -rw-r--r-- | src/oom/oomd-manager-bus.c | 2 | ||||
| -rw-r--r-- | src/oom/test-oomd-util.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/oom/oomctl.c b/src/oom/oomctl.c index e527abf5da..d18f999841 100644 --- a/src/oom/oomctl.c +++ b/src/oom/oomctl.c @@ -46,7 +46,7 @@ static int dump_state(int argc, char *argv[], void *userdata) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; - int fd = -1; + int fd = -EBADF; int r; r = sd_bus_open_system(&bus); diff --git a/src/oom/oomd-manager-bus.c b/src/oom/oomd-manager-bus.c index 3a3308f0c4..0581d58016 100644 --- a/src/oom/oomd-manager-bus.c +++ b/src/oom/oomd-manager-bus.c @@ -12,7 +12,7 @@ static int bus_method_dump_by_fd(sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_free_ char *dump = NULL; - _cleanup_close_ int fd = -1; + _cleanup_close_ int fd = -EBADF; Manager *m = ASSERT_PTR(userdata); int r; diff --git a/src/oom/test-oomd-util.c b/src/oom/test-oomd-util.c index faa75c5578..ed98812399 100644 --- a/src/oom/test-oomd-util.c +++ b/src/oom/test-oomd-util.c @@ -205,7 +205,7 @@ static void test_oomd_update_cgroup_contexts_between_hashmaps(void) { static void test_oomd_system_context_acquire(void) { _cleanup_(unlink_tempfilep) char path[] = "/oomdgetsysctxtestXXXXXX"; - _cleanup_close_ int fd = -1; + _cleanup_close_ int fd = -EBADF; OomdSystemContext ctx; if (geteuid() != 0) |