tree-wide: use strv_extend_strv_consume() where appropriate

2024-09-21 00:53:50 +02:00
parent 8a7ade7427
commit a2c8652a2a
20 changed files with 54 additions and 113 deletions
@@ -5361,13 +5361,13 @@ static int make_subvolumes_strv(const Partition *p, char ***ret) {
                        return log_oom();

        if (p->suppressing) {
-                _cleanup_strv_free_ char **suppressing = NULL;
+                char **suppressing;

                r = make_subvolumes_strv(p->suppressing, &suppressing);
                if (r < 0)
                        return r;

-                r = strv_extend_strv(&subvolumes, suppressing, /* filter_duplicates= */ true);
+                r = strv_extend_strv_consume(&subvolumes, suppressing, /* filter_duplicates= */ true);
                if (r < 0)
                        return log_oom();
        }