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/sd-resolve/sd-resolve.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/libsystemd/sd-resolve') diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c index f05fe10b6a..d81012467f 100644 --- a/src/libsystemd/sd-resolve/sd-resolve.c +++ b/src/libsystemd/sd-resolve/sd-resolve.c @@ -593,8 +593,7 @@ _public_ sd_resolve* sd_resolve_unref(sd_resolve *resolve) { /* Close all communication channels */ for (i = 0; i < _FD_MAX; i++) - if (resolve->fds[i] >= 0) - close_nointr_nofail(resolve->fds[i]); + safe_close(resolve->fds[i]); for (i = 0; i < QUERIES_MAX && resolve->n_queries > 0; i++) if (resolve->queries[i]) -- cgit v1.2.3-54-g00ecf