Merge pull request #2649 from cgwalters/misc-declare-and-initialize

cli: a few "Port to C99 style"

src/ostree/ot-admin-builtin-os-init.c

@@ -35,35 +35,29 @@ static GOptionEntry options[] = {
 gboolean
 ot_admin_builtin_os_init (int argc, char **argv, OstreeCommandInvocation *invocation, GCancellable *cancellable, GError **error)
 {
-  g_autoptr(GOptionContext) context = NULL;
+  g_autoptr(GOptionContext) context = g_option_context_new ("OSNAME");
+
   g_autoptr(OstreeSysroot) sysroot = NULL;
-  gboolean ret = FALSE;
-  const char *osname = NULL;
-
-  context = g_option_context_new ("OSNAME");
-
   if (!ostree_admin_option_context_parse (context, options, &argc, &argv,
                                           OSTREE_ADMIN_BUILTIN_FLAG_SUPERUSER | OSTREE_ADMIN_BUILTIN_FLAG_UNLOCKED,
                                           invocation, &sysroot, cancellable, error))
-    goto out;
+    return FALSE;
 
   if (!ostree_sysroot_ensure_initialized (sysroot, cancellable, error))
-    goto out;
+    return FALSE;
 
   if (argc < 2)
     {
       ot_util_usage_error (context, "OSNAME must be specified", error);
-      goto out;
+      return FALSE;
     }
 
-  osname = argv[1];
+  const char *osname = argv[1];
 
   if (!ostree_sysroot_init_osname (sysroot, osname, cancellable, error))
-    goto out;
+    return FALSE;
 
   g_print ("ostree/deploy/%s initialized as OSTree root\n", osname);
 
-  ret = TRUE;
+  return TRUE;
- out:
-  return ret;
 }

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(GOptionContext) context = g_option_context_new ("INDEX");
+
   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");
-
   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];
+  const char *deploy_index_str = argv[1];
-  deploy_index = atoi (deploy_index_str);
+  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;
 

src/ostree/ot-admin-builtin-unlock.c

@@ -40,33 +40,28 @@ static GOptionEntry options[] = {
 gboolean
 ot_admin_builtin_unlock (int argc, char **argv, OstreeCommandInvocation *invocation, GCancellable *cancellable, GError **error)
 {
-  gboolean ret = FALSE;
+  g_autoptr(GOptionContext) context = g_option_context_new ("");
-  g_autoptr(GOptionContext) context = NULL;
+
   g_autoptr(OstreeSysroot) sysroot = NULL;
-  OstreeDeployment *booted_deployment = NULL;
-  OstreeDeploymentUnlockedState target_state;
-
-  context = g_option_context_new ("");
-
   if (!ostree_admin_option_context_parse (context, options, &argc, &argv,
                                           OSTREE_ADMIN_BUILTIN_FLAG_SUPERUSER,
                                           invocation, &sysroot, cancellable, error))
-    goto out;
+    return FALSE;
   
   if (argc > 1)
     {
       ot_util_usage_error (context, "This command takes no extra arguments", error);
-      goto out;
+      return FALSE;
     }
 
-  booted_deployment = ostree_sysroot_require_booted_deployment (sysroot, error);
+  OstreeDeployment *booted_deployment = ostree_sysroot_require_booted_deployment (sysroot, error);
   if (!booted_deployment)
-    goto out;
+    return FALSE;
 
+  OstreeDeploymentUnlockedState target_state;
   if (opt_hotfix && opt_transient)
     {
-      glnx_throw (error, "Cannot specify both --hotfix and --transient");
+      return glnx_throw (error, "Cannot specify both --hotfix and --transient");
-      goto out;
     }
   else if (opt_hotfix)
     target_state = OSTREE_DEPLOYMENT_UNLOCKED_HOTFIX;
@@ -77,8 +72,8 @@ ot_admin_builtin_unlock (int argc, char **argv, OstreeCommandInvocation *invocat
 
   if (!ostree_sysroot_deployment_unlock (sysroot, booted_deployment,
                                          target_state, cancellable, error))
-    goto out;
+    return FALSE;
-  
+
   switch (target_state)
     {
     case OSTREE_DEPLOYMENT_UNLOCKED_NONE:
@@ -99,7 +94,5 @@ ot_admin_builtin_unlock (int argc, char **argv, OstreeCommandInvocation *invocat
       break;
     }
 
-  ret = TRUE;
+  return TRUE;
- out:
-  return ret;
 }