escape: use free_and_replace

Author: keszybz

src/escape/escape.c

@@ -197,17 +197,15 @@ 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;
 
                                 x = strjoin(e, ".", arg_suffix);
                                 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);