From 0fd8d506f4c41cb5b43649adde154353198d1ea8 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Sun, 2 Aug 2015 00:35:22 +0900 Subject: sd-bus: cleanup bus_close_fds() The safe_close() already checks the fd and returns -1. --- src/libsystemd/sd-bus/sd-bus.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 767df40e81..b9e93f6f41 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/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) { -- cgit v1.2.3-54-g00ecf From 253f96e53eb98dd811d380ffe108c53f48765ad2 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Sun, 2 Aug 2015 00:59:42 +0900 Subject: sd-bus: use mfree() in bus_reset_queues() Recently mfree() was introduced to reduce work of tedious free + reset pointers. Use it in bus_reset_queues() too. --- src/libsystemd/sd-bus/sd-bus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index b9e93f6f41..e700168659 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -84,15 +84,13 @@ static void bus_reset_queues(sd_bus *b) { while (b->rqueue_size > 0) sd_bus_message_unref(b->rqueue[--b->rqueue_size]); - free(b->rqueue); - b->rqueue = NULL; + b->rqueue = mfree(b->rqueue); b->rqueue_allocated = 0; while (b->wqueue_size > 0) sd_bus_message_unref(b->wqueue[--b->wqueue_size]); - free(b->wqueue); - b->wqueue = NULL; + b->wqueue = mfree(b->wqueue); b->wqueue_allocated = 0; } -- cgit v1.2.3-54-g00ecf From ba243e5155fd824dcd5235992e691017bd328b3f Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Sun, 2 Aug 2015 00:59:42 +0900 Subject: sd-bus: cleanup bus_reset_parsed_address() Both strv_free() and mfree() return NULL pointer after free. --- src/libsystemd/sd-bus/sd-bus.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index e700168659..0f075907d5 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -902,15 +902,11 @@ static void bus_reset_parsed_address(sd_bus *b) { zero(b->sockaddr); b->sockaddr_size = 0; - strv_free(b->exec_argv); - free(b->exec_path); - b->exec_path = NULL; - b->exec_argv = NULL; + b->exec_argv = strv_free(b->exec_argv); + b->exec_path = mfree(b->exec_path); b->server_id = SD_ID128_NULL; - free(b->kernel); - b->kernel = NULL; - free(b->machine); - b->machine = NULL; + b->kernel = mfree(b->kernel); + b->machine = mfree(b->machine); b->nspid = 0; } -- cgit v1.2.3-54-g00ecf