]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
bus-unit-util: use free_and_strdup() where we can
authorLennart Poettering <lennart@poettering.net>
Wed, 6 Mar 2019 18:15:22 +0000 (19:15 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 13 Mar 2019 16:38:43 +0000 (17:38 +0100)
src/shared/bus-unit-util.c

index d0bfd1894fb9d2ffefe9262feef0b5ab1d8f6a79..32dfd3e914d10540c5224f25de904387fb6480dd 100644 (file)
@@ -1814,11 +1814,8 @@ static int match_job_removed(sd_bus_message *m, void *userdata, sd_bus_error *er
 
         free(found);
 
-        if (!isempty(result))
-                d->result = strdup(result);
-
-        if (!isempty(unit))
-                d->name = strdup(unit);
+        (void) free_and_strdup(&d->result, empty_to_null(result));
+        (void) free_and_strdup(&d->name, empty_to_null(unit));
 
         return 0;
 }