From: Daniel Lockyer <thisisdaniellockyer@gmail.com>
Date: Fri, 24 Nov 2017 10:33:41 +0000 (+0000)
Subject: Replace free and reassignment with free_and_replace
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c9c55544e20de9ed65a2292e634bd340e68675e4;p=elogind.git

Replace free and reassignment with free_and_replace
---

diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c
index b180fab33..c305e8c37 100644
--- a/src/libelogind/sd-bus/sd-bus.c
+++ b/src/libelogind/sd-bus/sd-bus.c
@@ -790,9 +790,7 @@ static int parse_container_unix_address(sd_bus *b, const char **p, char **guid)
                 if (!machine_name_is_valid(machine))
                         return -EINVAL;
 
-                free(b->machine);
-                b->machine = machine;
-                machine = NULL;
+                free_and_replace(b->machine, machine);
         } else {
                 b->machine = mfree(b->machine);
         }