tree-wide: use strv_extend_strv_consume() where appropriate

src/shared/bootspec.c

@@ -176,7 +176,7 @@ static int parse_path_many(
                         return r;
         }
 
-        return strv_extend_strv(s, f, /* filter_duplicates= */ false);
+        return strv_extend_strv_consume(s, TAKE_PTR(f), /* filter_duplicates= */ false);
 }
 
 static int parse_tries(const char *fname, const char **p, unsigned *ret) {

src/shared/conf-parser.c

@@ -1343,7 +1343,7 @@ int config_parse_strv(
                         return log_oom();
         }
 
-        r = strv_extend_strv(sv, strv, /* filter_duplicates = */ ltype);
+        r = strv_extend_strv_consume(sv, TAKE_PTR(strv), /* filter_duplicates = */ ltype);
         if (r < 0)
                 return log_oom();
 

src/shared/module-util.c

@@ -49,25 +49,8 @@ int dlopen_libkmod(void) {
                         DLSYM_ARG(kmod_validate_resources));
 }
 
-static int denylist_modules(const char *p, char ***denylist) {
-        _cleanup_strv_free_ char **k = NULL;
-        int r;
-
-        assert(p);
-        assert(denylist);
-
-        k = strv_split(p, ",");
-        if (!k)
-                return -ENOMEM;
-
-        r = strv_extend_strv(denylist, k, /* filter_duplicates= */ true);
-        if (r < 0)
-                return r;
-
-        return 0;
-}
-
 static int parse_proc_cmdline_item(const char *key, const char *value, void *data) {
+        char ***denylist = ASSERT_PTR(data);
         int r;
 
         if (proc_cmdline_key_streq(key, "module_blacklist")) {
@@ -75,7 +58,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value, void *dat
                 if (proc_cmdline_value_missing(key, value))
                         return 0;
 
-                r = denylist_modules(value, data);
+                r = strv_split_and_extend(denylist, value, ",", /* filter_duplicates = */ true);
                 if (r < 0)
                         return r;
         }

src/shared/user-record.c

@@ -626,16 +626,15 @@ static int json_dispatch_weight(const char *name, sd_json_variant *variant, sd_j
 }
 
 int json_dispatch_user_group_list(const char *name, sd_json_variant *variant, sd_json_dispatch_flags_t flags, void *userdata) {
+        char ***list = ASSERT_PTR(userdata);
         _cleanup_strv_free_ char **l = NULL;
-        char ***list = userdata;
-        sd_json_variant *e;
         int r;
 
         if (!sd_json_variant_is_array(variant))
                 return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an array of strings.", strna(name));
 
+        sd_json_variant *e;
         JSON_VARIANT_ARRAY_FOREACH(e, variant) {
-
                 if (!sd_json_variant_is_string(e))
                         return json_log(e, flags, SYNTHETIC_ERRNO(EINVAL), "JSON array element is not a string.");
 
@@ -647,7 +646,7 @@ int json_dispatch_user_group_list(const char *name, sd_json_variant *variant, sd
                         return json_log(e, flags, r, "Failed to append array element: %m");
         }
 
-        r = strv_extend_strv(list, l, true);
+        r = strv_extend_strv_consume(list, TAKE_PTR(l), /* filter_duplicates = */ true);
         if (r < 0)
                 return json_log(variant, flags, r, "Failed to merge user/group arrays: %m");