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/journal/sd-journal.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/journal/sd-journal.c')
| -rw-r--r-- | src/journal/sd-journal.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index b54bc21090..7587211506 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -1850,8 +1850,7 @@ _public_ void sd_journal_close(sd_journal *j) { hashmap_free(j->directories_by_path); hashmap_free(j->directories_by_wd); - if (j->inotify_fd >= 0) - close_nointr_nofail(j->inotify_fd); + safe_close(j->inotify_fd); if (j->mmap) { log_debug("mmap cache statistics: %u hit, %u miss", mmap_cache_get_hit(j->mmap), mmap_cache_get_missed(j->mmap)); |