From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 9 May 2018 15:34:46 +0000 (+0900)
Subject: tree-wide: use strv_free_and_replace() macro
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4f05c22da5971ae52d8987d77746442f81ece573;p=elogind.git

tree-wide: use strv_free_and_replace() macro
---

diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c
index 218933196..22a7c99ea 100644
--- a/src/libelogind/sd-bus/sd-bus.c
+++ b/src/libelogind/sd-bus/sd-bus.c
@@ -313,10 +313,7 @@ _public_ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[])
                 return -ENOMEM;
 
         free_and_replace(bus->exec_path, p);
-
-        strv_free(bus->exec_argv);
-        bus->exec_argv = a;
-
+        strv_free_and_replace(bus->exec_argv, a);
         return 0;
 }
 
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 52f8432fc..9d3bd4a82 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1082,9 +1082,7 @@ static int map_basic(sd_bus *bus, const char *member, sd_bus_message *m, unsigne
                 if (r < 0)
                         return r;
 
-                strv_free(*p);
-                *p = TAKE_PTR(l);
-                return 0;
+                return strv_free_and_replace(*p, l);
         }
 
         case SD_BUS_TYPE_BOOLEAN: {