core: free_and_strdup() FTW!

2017-09-27 18:26:18 +02:00
parent 4724964040
commit 84b26d5149
1 changed files with 6 additions and 12 deletions
@@ -314,22 +314,16 @@ int unit_choose_id(Unit *u, const char *name) {
 }

 int unit_set_description(Unit *u, const char *description) {
-        char *s;
+        int r;

        assert(u);

-        if (isempty(description))
-                s = NULL;
-        else {
-                s = strdup(description);
-                if (!s)
-                        return -ENOMEM;
-        }
+        r = free_and_strdup(&u->description, empty_to_null(description));
+        if (r < 0)
+                return r;
+        if (r > 0)
+                unit_add_to_dbus_queue(u);

-        free(u->description);
-        u->description = s;
-
-        unit_add_to_dbus_queue(u);
        return 0;
 }