From 03e334a1c7dc8c20c38902aa039440763acc9b17 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 18 Mar 2014 19:22:43 +0100 Subject: util: replace close_nointr_nofail() by a more useful safe_close() safe_close() automatically becomes a NOP when a negative fd is passed, and returns -1 unconditionally. This makes it easy to write lines like this: fd = safe_close(fd); Which will close an fd if it is open, and reset the fd variable correctly. By making use of this new scheme we can drop a > 200 lines of code that was required to test for non-negative fds or to reset the closed fd variable afterwards. --- src/libsystemd-network/dhcp-network.c | 4 ++-- src/libsystemd-network/ipv4ll-network.c | 2 +- src/libsystemd-network/sd-dhcp-client.c | 15 ++++----------- src/libsystemd-network/sd-ipv4ll.c | 4 +--- 4 files changed, 8 insertions(+), 17 deletions(-) (limited to 'src/libsystemd-network') diff --git a/src/libsystemd-network/dhcp-network.c b/src/libsystemd-network/dhcp-network.c index 934e8bf13e..29e915c473 100644 --- a/src/libsystemd-network/dhcp-network.c +++ b/src/libsystemd-network/dhcp-network.c @@ -52,7 +52,7 @@ int dhcp_network_bind_raw_socket(int index, union sockaddr_union *link) return -errno; if (bind(s, &link->sa, sizeof(link->ll)) < 0) { - close_nointr_nofail(s); + safe_close(s); return -errno; } @@ -73,7 +73,7 @@ int dhcp_network_bind_udp_socket(int index, be32_t address, uint16_t port) return -errno; if (bind(s, &src.sa, sizeof(src.in)) < 0) { - close_nointr_nofail(s); + safe_close(s); return -errno; } diff --git a/src/libsystemd-network/ipv4ll-network.c b/src/libsystemd-network/ipv4ll-network.c index 51734d7e4d..68666fb71d 100644 --- a/src/libsystemd-network/ipv4ll-network.c +++ b/src/libsystemd-network/ipv4ll-network.c @@ -48,7 +48,7 @@ int arp_network_bind_raw_socket(int index, union sockaddr_union *link) { link->ll.sll_halen = ETH_ALEN; if (bind(s, &link->sa, sizeof(link->ll)) < 0) { - close_nointr_nofail(s); + safe_close(s); return -errno; } diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c index 5374db74cb..2d3af2f187 100644 --- a/src/libsystemd-network/sd-dhcp-client.c +++ b/src/libsystemd-network/sd-dhcp-client.c @@ -184,9 +184,7 @@ static int client_stop(sd_dhcp_client *client, int error) { client->receive_message = sd_event_source_unref(client->receive_message); - if (client->fd >= 0) - close_nointr_nofail(client->fd); - client->fd = -1; + client->fd = safe_close(client->fd); client->timeout_resend = sd_event_source_unref(client->timeout_resend); @@ -546,12 +544,8 @@ static int client_timeout_t2(sd_event_source *s, uint64_t usec, void *userdata) sd_dhcp_client *client = userdata; int r; - if (client->fd >= 0) { - client->receive_message = - sd_event_source_unref(client->receive_message); - close_nointr_nofail(client->fd); - client->fd = -1; - } + client->receive_message = sd_event_source_unref(client->receive_message); + client->fd = safe_close(client->fd); client->state = DHCP_STATE_REBINDING; client->attempt = 1; @@ -849,8 +843,7 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, client->receive_message = sd_event_source_unref(client->receive_message); - close_nointr_nofail(client->fd); - client->fd = -1; + client->fd = safe_close(client->fd); } r = 0; diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c index c6f6e01431..689dce9adf 100644 --- a/src/libsystemd-network/sd-ipv4ll.c +++ b/src/libsystemd-network/sd-ipv4ll.c @@ -113,9 +113,7 @@ static int ipv4ll_stop(sd_ipv4ll *ll, int event) { assert(ll); ll->receive_message = sd_event_source_unref(ll->receive_message); - if (ll->fd >= 0) - close_nointr_nofail(ll->fd); - ll->fd = -1; + ll->fd = safe_close(ll->fd); ll->timer = sd_event_source_unref(ll->timer); -- cgit v1.2.3-54-g00ecf