shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 10:51:20 +03:00
Code

sd-bus: make use of free_and_strdup() where it makes sense

Browse Source
This commit is contained in:
Lennart Poettering 2014-11-04 16:58:15 +01:00
parent 9cbfc66c62
commit d1b91c99d9
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,21 +324,12 @@ _public_ int sd_bus_set_trusted(sd_bus *bus, int b) {
} }
_public_ int sd_bus_set_description(sd_bus *bus, const char *description) { _public_ int sd_bus_set_description(sd_bus *bus, const char *description) {
char *n;
assert_return(bus, -EINVAL); assert_return(bus, -EINVAL);
assert_return(description, -EINVAL); assert_return(description, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM); assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD); assert_return(!bus_pid_changed(bus), -ECHILD);
n = strdup(description); return free_and_strdup(&bus->description, description);
if (!n)
return -ENOMEM;
free(bus->description);
bus->description = n;
return 0;
} }
static int hello_callback(sd_bus *bus, sd_bus_message *reply, void *userdata, sd_bus_error *error) { static int hello_callback(sd_bus *bus, sd_bus_message *reply, void *userdata, sd_bus_error *error) {