From: Colin Walters <walters@verbum.org>
Date: Tue, 14 Jun 2022 13:50:07 +0000 (-0400)
Subject: cli/undeploy: Port to C99 style
X-Git-Tag: archive/raspbian/2022.5-1+rpi1^2~9^2^2~23^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=588b07e5542106eb3baef046f7858b9c6f56736f;p=ostree.git

cli/undeploy: Port to C99 style

General background cleanup.
---

diff --git a/src/ostree/ot-admin-builtin-undeploy.c b/src/ostree/ot-admin-builtin-undeploy.c
index 41155689..c079c83f 100644
--- a/src/ostree/ot-admin-builtin-undeploy.c
+++ b/src/ostree/ot-admin-builtin-undeploy.c
@@ -34,15 +34,9 @@ static GOptionEntry options[] = {
 gboolean
 ot_admin_builtin_undeploy (int argc, char **argv, OstreeCommandInvocation *invocation, GCancellable *cancellable, GError **error)
 {
-  g_autoptr(GOptionContext) context = NULL;
-  g_autoptr(OstreeSysroot) sysroot = NULL;
-  const char *deploy_index_str;
-  int deploy_index;
-  g_autoptr(GPtrArray) current_deployments = NULL;
-  g_autoptr(OstreeDeployment) target_deployment = NULL;
-
-  context = g_option_context_new ("INDEX");
+  g_autoptr(GOptionContext) context = g_option_context_new ("INDEX");
 
+  g_autoptr(OstreeSysroot) sysroot = NULL;
   if (!ostree_admin_option_context_parse (context, options, &argc, &argv,
                                           OSTREE_ADMIN_BUILTIN_FLAG_SUPERUSER,
                                           invocation, &sysroot, cancellable, error))
@@ -54,12 +48,13 @@ ot_admin_builtin_undeploy (int argc, char **argv, OstreeCommandInvocation *invoc
       return FALSE;
     }
 
-  current_deployments = ostree_sysroot_get_deployments (sysroot);
+  g_autoptr(GPtrArray) current_deployments = ostree_sysroot_get_deployments (sysroot);
 
-  deploy_index_str = argv[1];
-  deploy_index = atoi (deploy_index_str);
+  const char *deploy_index_str = argv[1];
+  int deploy_index = atoi (deploy_index_str);
 
-  target_deployment = ot_admin_get_indexed_deployment (sysroot, deploy_index, error);
+  g_autoptr(OstreeDeployment) target_deployment =
+    ot_admin_get_indexed_deployment (sysroot, deploy_index, error);
   if (!target_deployment)
     return FALSE;