From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Mar 2019 18:15:22 +0000 (+0100)
Subject: bus-unit-util: use free_and_strdup() where we can
X-Git-Tag: v242-rc1~131^2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c070ea08634ba0471fa323293776ecee787eaef;p=thirdparty%2Fsystemd.git

bus-unit-util: use free_and_strdup() where we can
---

diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index d0bfd1894fb..32dfd3e914d 100644
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -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;
 }