From 1c070ea08634ba0471fa323293776ecee787eaef Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 6 Mar 2019 19:15:22 +0100
Subject: [PATCH] bus-unit-util: use free_and_strdup() where we can

---
 src/shared/bus-unit-util.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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;
 }
-- 
2.47.3