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/core/audit-fd.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/core/audit-fd.c')
-rw-r--r-- | src/core/audit-fd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/audit-fd.c b/src/core/audit-fd.c index 5955bd846e..4326d17360 100644 --- a/src/core/audit-fd.c +++ b/src/core/audit-fd.c @@ -55,7 +55,7 @@ int get_audit_fd(void) { void close_audit_fd(void) { if (initialized && audit_fd >= 0) - close_nointr_nofail(audit_fd); + safe_close(audit_fd); initialized = true; audit_fd = -ECONNRESET; |