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/udev/net/link-config.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/udev') diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index d3f1affffe..62439c0c71 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -127,8 +127,7 @@ void link_config_ctx_free(link_config_ctx *ctx) { if (!ctx) return; - if (ctx->ethtool_fd >= 0) - close_nointr_nofail(ctx->ethtool_fd); + safe_close(ctx->ethtool_fd); sd_rtnl_unref(ctx->rtnl); -- cgit v1.2.3-54-g00ecf