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 2189331965b6b54217d5cd8dc8804562507e28ec..22a7c99eaa36782e2d7928616c07e7e44ffb432a 100644 (file)
--- 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 52f8432fc93eec1084f58fdc61f8e1b78a5a1bd1..9d3bd4a82b4cead7d349614473ca06a727baa43c 100644 (file)
--- 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: {