summaryrefslogtreecommitdiffstats
path: root/src/socket-proxy
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/socket-proxy
parentsd-event: never pass negative errnos as signalfd to signalfd (diff)
downloadsystemd-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/socket-proxy')
-rw-r--r--src/socket-proxy/socket-proxyd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index fb262842d8..c3bb293520 100644
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -486,7 +486,7 @@ static int add_connection_socket(Context *context, int fd) {
*c = (Connection) {
.context = context,
.server_fd = fd,
- .client_fd = -1,
+ .client_fd = -EBADF,
.server_to_client_buffer = {-1, -1},
.client_to_server_buffer = {-1, -1},
};
@@ -504,7 +504,7 @@ static int add_connection_socket(Context *context, int fd) {
static int accept_cb(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
_cleanup_free_ char *peer = NULL;
Context *context = ASSERT_PTR(userdata);
- int nfd = -1, r;
+ int nfd = -EBADF, r;
assert(s);
assert(fd >= 0);