admin: Port to c99 style

- Drop `goto out`
- Use declare-and-initialize

diff --git a/src/ostree/ot-builtin-admin.c b/src/ostree/ot-builtin-admin.c
index 14f776c02e8bddeb49a321595114128b347a47cd..7697f43bb1d3c7ed9767a9c5fc2930926b36e5b2 100644 (file)
--- a/src/ostree/ot-builtin-admin.c
+++ b/src/ostree/ot-builtin-admin.c
@@ -93,18 +93,13 @@ gboolean
 ostree_builtin_admin (int argc, char **argv, OstreeCommandInvocation *invocation,
                       GCancellable *cancellable, GError **error)
 {
-  gboolean ret = FALSE;
-  const char *subcommand_name = NULL;
-  OstreeCommand *subcommand;
-  g_autofree char *prgname = NULL;
-  int in, out;
-
   /*
    * Parse the global options. We rearrange the options as
    * necessary, in order to pass relevant options through
    * to the commands, but also have them take effect globally.
    */
-
+  int in, out;
+  const char *subcommand_name = NULL;
   for (in = 1, out = 1; in < argc; in++, out++)
     {
       /* The non-option is the command, take it out of the arguments */
@@ -128,7 +123,7 @@ ostree_builtin_admin (int argc, char **argv, OstreeCommandInvocation *invocation
 
   argc = out;
 
-  subcommand = admin_subcommands;
+  OstreeCommand *subcommand = admin_subcommands;
   while (subcommand->name)
     {
       if (g_strcmp0 (subcommand_name, subcommand->name) == 0)
@@ -163,17 +158,14 @@ ostree_builtin_admin (int argc, char **argv, OstreeCommandInvocation *invocation
       help = g_option_context_get_help (context, FALSE, NULL);
       g_printerr ("%s", help);
 
-      goto out;
+      return FALSE;
     }
 
-  prgname = g_strdup_printf ("%s %s", g_get_prgname (), subcommand_name);
-  g_set_prgname (prgname);
+  {
+    g_autofree char *prgname = g_strdup_printf ("%s %s", g_get_prgname (), subcommand_name);
+    g_set_prgname (prgname);
+  }
 
   OstreeCommandInvocation sub_invocation = { .command = subcommand };
-  if (!subcommand->fn (argc, argv, &sub_invocation, cancellable, error))
-    goto out;
-
-  ret = TRUE;
-out:
-  return ret;
+  return subcommand->fn (argc, argv, &sub_invocation, cancellable, error);
 }