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/libsystemd/sd-netlink | |
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/libsystemd/sd-netlink')
-rw-r--r-- | src/libsystemd/sd-netlink/netlink-util.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-netlink/sd-netlink.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libsystemd/sd-netlink/netlink-util.c b/src/libsystemd/sd-netlink/netlink-util.c index af601bd347..6cd916a209 100644 --- a/src/libsystemd/sd-netlink/netlink-util.c +++ b/src/libsystemd/sd-netlink/netlink-util.c @@ -658,7 +658,7 @@ static int socket_open(int family) { } int netlink_open_family(sd_netlink **ret, int family) { - _cleanup_close_ int fd = -1; + _cleanup_close_ int fd = -EBADF; int r; fd = socket_open(family); diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c index fe888926a1..132f63e57d 100644 --- a/src/libsystemd/sd-netlink/sd-netlink.c +++ b/src/libsystemd/sd-netlink/sd-netlink.c @@ -31,7 +31,7 @@ static int netlink_new(sd_netlink **ret) { *nl = (sd_netlink) { .n_ref = 1, - .fd = -1, + .fd = -EBADF, .sockaddr.nl.nl_family = AF_NETLINK, .original_pid = getpid_cached(), .protocol = -1, @@ -93,7 +93,7 @@ int sd_netlink_open_fd(sd_netlink **ret, int fd) { r = socket_bind(nl); if (r < 0) { - nl->fd = -1; /* on failure, the caller remains owner of the fd, hence don't close it here */ + nl->fd = -EBADF; /* on failure, the caller remains owner of the fd, hence don't close it here */ nl->protocol = -1; return r; } |