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/core/smack-setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/smack-setup.c') diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c index a68605c272..5f6dabf82a 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c @@ -87,7 +87,7 @@ static int write_rules(const char* dstpath, const char* srcdir) { if (!policy) { if (r == 0) r = -errno; - close_nointr_nofail(fd); + safe_close(fd); log_error("Failed to open %s: %m", entry->d_name); continue; } -- cgit v1.2.3-54-g00ecf