diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-03-18 19:22:43 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-03-18 19:31:34 +0100 |
| commit | 03e334a1c7dc8c20c38902aa039440763acc9b17 (patch) | |
| tree | bc30b522de8ef9c251bf3ff2fe2d52c92dd8b1ea /src/libsystemd/sd-resolve/sd-resolve.c | |
| parent | 9459781ee66eb57709c8b8701701365ba60a9f1c (diff) | |
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.
Diffstat (limited to 'src/libsystemd/sd-resolve/sd-resolve.c')
| -rw-r--r-- | src/libsystemd/sd-resolve/sd-resolve.c | 3 |
1 files changed, 1 insertions, 2 deletions
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]) |