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/login/test-inhibit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/login/test-inhibit.c') diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c index 70b8314e3f..70780c30af 100644 --- a/src/login/test-inhibit.c +++ b/src/login/test-inhibit.c @@ -101,11 +101,11 @@ int main(int argc, char*argv[]) { assert(fd2 >= 0); print_inhibitors(bus); - close_nointr_nofail(fd1); + safe_close(fd1); sleep(1); print_inhibitors(bus); - close_nointr_nofail(fd2); + safe_close(fd2); sleep(1); print_inhibitors(bus); -- cgit v1.2.3-54-g00ecf