From 82217e4cb4ac5dfd90b80a4f175ff0681cb107d5 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Sun, 2 Aug 2015 00:35:22 +0900 Subject: [PATCH] sd-bus: cleanup bus_close_fds() The safe_close() already checks the fd and returns -1. --- src/libelogind/sd-bus/sd-bus.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c index eb9525ed7..1d60600fa 100644 --- a/src/libelogind/sd-bus/sd-bus.c +++ b/src/libelogind/sd-bus/sd-bus.c @@ -73,13 +73,9 @@ static void bus_close_fds(sd_bus *b) { detach_io_events(b); - if (b->input_fd >= 0) - safe_close(b->input_fd); - - if (b->output_fd >= 0 && b->output_fd != b->input_fd) + if (b->input_fd != b->output_fd) safe_close(b->output_fd); - - b->input_fd = b->output_fd = -1; + b->output_fd = b->input_fd = safe_close(b->input_fd); } static void bus_reset_queues(sd_bus *b) { -- 2.30.2