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/dbus.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/dbus.c')
| -rw-r--r-- | src/core/dbus.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/core/dbus.c b/src/core/dbus.c index 72f36bdc1c..d482e6c537 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -1086,10 +1086,7 @@ void bus_done(Manager *m) { if (m->private_listen_event_source) m->private_listen_event_source = sd_event_source_unref(m->private_listen_event_source); - if (m->private_listen_fd >= 0) { - close_nointr_nofail(m->private_listen_fd); - m->private_listen_fd = -1; - } + m->private_listen_fd = safe_close(m->private_listen_fd); } int bus_fdset_add_all(Manager *m, FDSet *fds) { |