From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 4 Nov 2014 15:58:15 +0000 (+0100)
Subject: sd-bus: make use of free_and_strdup() where it makes sense
X-Git-Tag: v218~566
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d1b91c99d9241f7f79756a42f845cf35992888cd;hp=9cbfc66c621c42aa6e58e9e0da0adfb01efa7537

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

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 251720a6b..ba8d5e60f 100644
--- 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) {
-        char *n;
-
         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) {