From 8196dace8a9e93f0453df4be4e3e79e6ba3d5b09 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 30 Nov 2023 10:26:32 -0500 Subject: [PATCH] sysroot/deploy: Drop unnecessary g_ptr_array_free We can just reference the pdata, and autoptr the array. --- src/libostree/ostree-sysroot-deploy.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c index cc70741355..5508bacccd 100644 --- a/src/libostree/ostree-sysroot-deploy.c +++ b/src/libostree/ostree-sysroot-deploy.c @@ -3225,8 +3225,7 @@ run_in_deployment (int deployment_dfd, const gchar *const *child_argv, gint *exi "/sbin", NULL }; - GPtrArray *args = g_ptr_array_new (); - g_autofree gchar **args_raw = NULL; + g_autoptr (GPtrArray) args = g_ptr_array_new (); for (char **it = (char **)COMMON_ARGV; it && *it; it++) g_ptr_array_add (args, it); @@ -3236,9 +3235,7 @@ run_in_deployment (int deployment_dfd, const gchar *const *child_argv, gint *exi g_ptr_array_add (args, NULL); - args_raw = (gchar **)g_ptr_array_free (args, FALSE); - - return g_spawn_sync (NULL, args_raw, NULL, 0, &child_setup_fchdir, + return g_spawn_sync (NULL, (char **)args->pdata, NULL, 0, &child_setup_fchdir, (gpointer)(uintptr_t)deployment_dfd, stdout, NULL, exit_status, error); }