picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #834 from namhyung/sdbus-cleanup-v2

Browse source 
sd-bus: Small cleanups (v2)
This commit is contained in:
David Herrmann 2015-08-02 19:32:21 +02:00
parent f429182e62 ba243e5155
commit 13fd31ccc6
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/libsystemd/sd-bus/sd-bus.c
View file

@ -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) {
@ -88,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;
}
@ -908,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;
}