summaryrefslogtreecommitdiff
path: root/src/core/automount.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-12-19 13:07:42 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-12-19 15:00:57 +0100
commit254d1313ae5a69c08c9b93032aaaf3d6083cfc07 (patch)
tree067102a36abe6bf597c26a42d79018a1060c9007 /src/core/automount.c
parentcbff793ffb280d9d11e5d7b1dc3964276491bee8 (diff)
downloadsystemd-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/core/automount.c')
-rw-r--r--src/core/automount.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/automount.c b/src/core/automount.c
index a44b8e878d..d2976d6734 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -73,7 +73,7 @@ static void automount_init(Unit *u) {
assert(u);
assert(u->load_state == UNIT_STUB);
- a->pipe_fd = -1;
+ a->pipe_fd = -EBADF;
a->directory_mode = 0755;
UNIT(a)->ignore_on_isolate = true;
}
@@ -392,7 +392,7 @@ static int open_ioctl_fd(int dev_autofs_fd, const char *where, dev_t devid) {
init_autofs_dev_ioctl(param);
param->size = l;
- param->ioctlfd = -1;
+ param->ioctlfd = -EBADF;
param->openmount.devid = devid;
strcpy(param->path, where);
@@ -470,7 +470,7 @@ static int autofs_send_ready(int dev_autofs_fd, int ioctl_fd, uint32_t token, in
}
static int automount_send_ready(Automount *a, Set *tokens, int status) {
- _cleanup_close_ int ioctl_fd = -1;
+ _cleanup_close_ int ioctl_fd = -EBADF;
unsigned token;
int r;
@@ -572,7 +572,7 @@ static void automount_trigger_notify(Unit *u, Unit *other) {
}
static void automount_enter_waiting(Automount *a) {
- _cleanup_close_ int ioctl_fd = -1;
+ _cleanup_close_ int ioctl_fd = -EBADF;
int p[2] = { -1, -1 };
char name[STRLEN("systemd-") + DECIMAL_STR_MAX(pid_t) + 1];
_cleanup_free_ char *options = NULL;
@@ -707,7 +707,7 @@ static int automount_dispatch_expire(sd_event_source *source, usec_t usec, void
if (!data)
return log_oom();
- data->ioctl_fd = -1;
+ data->ioctl_fd = -EBADF;
data->dev_autofs_fd = fcntl(UNIT(a)->manager->dev_autofs_fd, F_DUPFD_CLOEXEC, 3);
if (data->dev_autofs_fd < 0)