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

sd-bus: use free_and_strdup()

This commit is contained in:
Yu Watanabe 2018-05-14 14:09:03 +09:00
parent 9d728570e7
commit 1ab436e314
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,19 +262,13 @@ _public_ int sd_bus_new(sd_bus **ret) {
}
_public_ int sd_bus_set_address(sd_bus *bus, const char *address) {
char *a;
assert_return(bus, -EINVAL);
assert_return(bus = bus_resolve(bus), -ENOPKG);
assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(address, -EINVAL);
assert_return(!bus_pid_changed(bus), -ECHILD);
a = strdup(address);
if (!a)
return -ENOMEM;
return free_and_replace(bus->address, a);
return free_and_strdup(&bus->address, address);
}
_public_ int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) {
@ -291,8 +285,8 @@ _public_ int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) {
}
_public_ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) {
_cleanup_free_ char *p = NULL;
char **a;
_cleanup_strv_free_ char **a = NULL;
int r;
assert_return(bus, -EINVAL);
assert_return(bus = bus_resolve(bus), -ENOPKG);
@ -301,17 +295,15 @@ _public_ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[])
assert_return(!strv_isempty(argv), -EINVAL);
assert_return(!bus_pid_changed(bus), -ECHILD);
p = strdup(path);
if (!p)
return -ENOMEM;
a = strv_copy(argv);
if (!a)
return -ENOMEM;
free_and_replace(bus->exec_path, p);
strv_free_and_replace(bus->exec_argv, a);
return 0;
r = free_and_strdup(&bus->exec_path, path);
if (r < 0)
return r;
return strv_free_and_replace(bus->exec_argv, a);
}
_public_ int sd_bus_set_bus_client(sd_bus *bus, int b) {
@ -535,7 +527,6 @@ void bus_set_state(sd_bus *bus, enum bus_state state) {
static int hello_callback(sd_bus_message *reply, void *userdata, sd_bus_error *error) {
const char *s;
char *t;
sd_bus *bus;
int r;
@ -555,11 +546,9 @@ static int hello_callback(sd_bus_message *reply, void *userdata, sd_bus_error *e
if (!service_name_is_valid(s) || s[0] != ':')
return -EBADMSG;
t = strdup(s);
if (!t)
return -ENOMEM;
free_and_replace(bus->unique_name, t);
r = free_and_strdup(&bus->unique_name, s);
if (r < 0)
return r;
if (bus->state == BUS_HELLO) {
bus_set_state(bus, BUS_RUNNING);