From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 16 Nov 2018 09:59:29 +0000 (+0100)
Subject: escape: use free_and_replace
X-Git-Tag: v240~280^2~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c88f45e7447149a4b22e24ccec920703b51f9acf;p=thirdparty%2Fsystemd.git

escape: use free_and_replace
---

diff --git a/src/escape/escape.c b/src/escape/escape.c
index 181949d49ef..ed42ad65adb 100644
--- a/src/escape/escape.c
+++ b/src/escape/escape.c
@@ -197,8 +197,7 @@ static int run(int argc, char *argv[]) {
                                 if (r < 0)
                                         return log_error_errno(r, "Failed to replace instance: %m");
 
-                                free(e);
-                                e = x;
+                                free_and_replace(e, x);
                         } else if (arg_suffix) {
                                 char *x;
 
@@ -206,8 +205,7 @@ static int run(int argc, char *argv[]) {
                                 if (!x)
                                         return log_oom();
 
-                                free(e);
-                                e = x;
+                                free_and_replace(e, x);
                         }
 
                         break;
@@ -254,7 +252,7 @@ static int run(int argc, char *argv[]) {
                         break;
                 }
 
-                if (i != argv+optind)
+                if (i != argv + optind)
                         fputc(' ', stdout);
 
                 fputs(e, stdout);