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/readahead/readahead-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/readahead/readahead-common.c') diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c index aea1fbeea4..5ffa88b78a 100644 --- a/src/readahead/readahead-common.c +++ b/src/readahead/readahead-common.c @@ -220,7 +220,7 @@ int open_inotify(void) { if (inotify_add_watch(fd, "/run/systemd/readahead", IN_CREATE) < 0) { log_error("Failed to watch /run/systemd/readahead: %m"); - close_nointr_nofail(fd); + safe_close(fd); return -errno; } -- cgit v1.2.3-54-g00ecf