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

sd-bus: add bus_freep and use _cleanup_

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-05-09 09:44:37 +02:00
parent 01c4dcaffb
commit 9df088f1ea
1 changed files with 41 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/libsystemd/sd-bus/sd-bus.c
View File

@ -163,7 +163,7 @@ static void bus_reset_queues(sd_bus *b) {
b->wqueue_allocated = 0;
}
static void bus_free(sd_bus *b) {
static sd_bus* bus_free(sd_bus *b) {
sd_bus_slot *s;
assert(b);
@ -228,9 +228,11 @@ static void bus_free(sd_bus *b) {
assert_se(pthread_mutex_destroy(&b->memfd_cache_mutex) == 0);
free(b);
return mfree(b);
}
DEFINE_TRIVIAL_CLEANUP_FUNC(sd_bus*, bus_free);
_public_ int sd_bus_new(sd_bus **ret) {
_cleanup_free_ sd_bus *b = NULL;
@ -1202,7 +1204,7 @@ _public_ int sd_bus_start(sd_bus *bus) {
_public_ int sd_bus_open_with_description(sd_bus **ret, const char *description) {
const char *e;
sd_bus *b;
_cleanup_(bus_freep) sd_bus *b = NULL;
int r;
assert_return(ret, -EINVAL);
@ -1233,7 +1235,7 @@ _public_ int sd_bus_open_with_description(sd_bus **ret, const char *description)
r = sd_bus_set_address(b, e);
if (r < 0)
goto fail;
return r;
b->bus_client = true;
@ -1245,14 +1247,10 @@ _public_ int sd_bus_open_with_description(sd_bus **ret, const char *description)
r = sd_bus_start(b);
if (r < 0)
goto fail;
return r;
*ret = b;
*ret = TAKE_PTR(b);
return 0;
fail:
bus_free(b);
return r;
}
_public_ int sd_bus_open(sd_bus **ret) {
@ -1271,7 +1269,7 @@ int bus_set_address_system(sd_bus *b) {
}
_public_ int sd_bus_open_system_with_description(sd_bus **ret, const char *description) {
sd_bus *b;
_cleanup_(bus_freep) sd_bus *b = NULL;
int r;
assert_return(ret, -EINVAL);
@ -1283,12 +1281,12 @@ _public_ int sd_bus_open_system_with_description(sd_bus **ret, const char *descr
if (description) {
r = sd_bus_set_description(b, description);
if (r < 0)
goto fail;
return r;
}
r = bus_set_address_system(b);
if (r < 0)
goto fail;
return r;
b->bus_client = true;
b->is_system = true;
@ -1301,14 +1299,10 @@ _public_ int sd_bus_open_system_with_description(sd_bus **ret, const char *descr
r = sd_bus_start(b);
if (r < 0)
goto fail;
return r;
*ret = b;
*ret = TAKE_PTR(b);
return 0;
fail:
bus_free(b);
return r;
}
_public_ int sd_bus_open_system(sd_bus **ret) {
@ -1342,7 +1336,7 @@ int bus_set_address_user(sd_bus *b) {
}
_public_ int sd_bus_open_user_with_description(sd_bus **ret, const char *description) {
sd_bus *b;
_cleanup_(bus_freep) sd_bus *b = NULL;
int r;
assert_return(ret, -EINVAL);
@ -1354,12 +1348,12 @@ _public_ int sd_bus_open_user_with_description(sd_bus **ret, const char *descrip
if (description) {
r = sd_bus_set_description(b, description);
if (r < 0)
goto fail;
return r;
}
r = bus_set_address_user(b);
if (r < 0)
goto fail;
return r;
b->bus_client = true;
b->is_user = true;
@ -1371,14 +1365,10 @@ _public_ int sd_bus_open_user_with_description(sd_bus **ret, const char *descrip
r = sd_bus_start(b);
if (r < 0)
goto fail;
return r;
*ret = b;
*ret = TAKE_PTR(b);
return 0;
fail:
bus_free(b);
return r;
}
_public_ int sd_bus_open_user(sd_bus **ret) {
@ -1426,35 +1416,31 @@ int bus_set_address_system_remote(sd_bus *b, const char *host) {
}
_public_ int sd_bus_open_system_remote(sd_bus **ret, const char *host) {
sd_bus *bus;
_cleanup_(bus_freep) sd_bus *b = NULL;
int r;
assert_return(host, -EINVAL);
assert_return(ret, -EINVAL);
r = sd_bus_new(&bus);
r = sd_bus_new(&b);
if (r < 0)
return r;
r = bus_set_address_system_remote(bus, host);
r = bus_set_address_system_remote(b, host);
if (r < 0)
goto fail;
return r;
bus->bus_client = true;
bus->trusted = false;
bus->is_system = true;
bus->is_local = false;
b->bus_client = true;
b->trusted = false;
b->is_system = true;
b->is_local = false;
r = sd_bus_start(bus);
r = sd_bus_start(b);
if (r < 0)
goto fail;
return r;
*ret = bus;
*ret = TAKE_PTR(b);
return 0;
fail:
bus_free(bus);
return r;
}
int bus_set_address_system_machine(sd_bus *b, const char *machine) {
@ -1476,40 +1462,35 @@ int bus_set_address_system_machine(sd_bus *b, const char *machine) {
}
_public_ int sd_bus_open_system_machine(sd_bus **ret, const char *machine) {
sd_bus *bus;
_cleanup_(bus_freep) sd_bus *b = NULL;
int r;
assert_return(machine, -EINVAL);
assert_return(ret, -EINVAL);
assert_return(machine_name_is_valid(machine), -EINVAL);
r = sd_bus_new(&bus);
r = sd_bus_new(&b);
if (r < 0)
return r;
r = bus_set_address_system_machine(bus, machine);
r = bus_set_address_system_machine(b, machine);
if (r < 0)
goto fail;
return r;
bus->bus_client = true;
bus->trusted = false;
bus->is_system = true;
bus->is_local = false;
b->bus_client = true;
b->trusted = false;
b->is_system = true;
b->is_local = false;
r = sd_bus_start(bus);
r = sd_bus_start(b);
if (r < 0)
goto fail;
return r;
*ret = bus;
*ret = TAKE_PTR(b);
return 0;
fail:
bus_free(bus);
return r;
}
_public_ void sd_bus_close(sd_bus *bus) {
if (!bus)
return;
if (bus->state == BUS_CLOSED)
@ -1533,7 +1514,6 @@ _public_ void sd_bus_close(sd_bus *bus) {
}
_public_ sd_bus* sd_bus_flush_close_unref(sd_bus *bus) {
if (!bus)
return NULL;
@ -1556,7 +1536,6 @@ void bus_enter_closing(sd_bus *bus) {
}
_public_ sd_bus *sd_bus_ref(sd_bus *bus) {
if (!bus)
return NULL;
@ -1575,12 +1554,10 @@ _public_ sd_bus *sd_bus_unref(sd_bus *bus) {
if (i > 0)
return NULL;
bus_free(bus);
return NULL;
return bus_free(bus);
}
_public_ int sd_bus_is_open(sd_bus *bus) {
assert_return(bus, -EINVAL);
assert_return(bus = bus_resolve(bus), -ENOPKG);
assert_return(!bus_pid_changed(bus), -ECHILD);