chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9cbfc66
)
sd-bus: make use of free_and_strdup() where it makes sense
author
Lennart Poettering
<lennart@poettering.net>
Tue, 4 Nov 2014 15:58:15 +0000
(16:58 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 4 Nov 2014 17:09:19 +0000
(18:09 +0100)
src/libsystemd/sd-bus/sd-bus.c
patch
|
blob
|
history
diff --git
a/src/libsystemd/sd-bus/sd-bus.c
b/src/libsystemd/sd-bus/sd-bus.c
index 251720a6ba7f3efc87cca102fa8c26a633ece970..ba8d5e60fb4fc8f6f6d79799a0a17b77901e2c13 100644
(file)
--- a/
src/libsystemd/sd-bus/sd-bus.c
+++ b/
src/libsystemd/sd-bus/sd-bus.c
@@
-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(description, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD);
assert_return(bus, -EINVAL);
assert_return(description, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD);
- n = strdup(description);
- if (!n)
- return -ENOMEM;
-
- free(bus->description);
- bus->description = n;
-
- return 0;
+ return free_and_strdup(&bus->description, description);
}
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) {