From 46e1db392d59e6956d705037feaf6c64b8a15a16 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 14 Jun 2022 09:50:07 -0400 Subject: [PATCH] cli/os-init: Port to C99 style General background cleanup; motivated by a recent PR which was using pre-C99 code as a base. --- src/ostree/ot-admin-builtin-os-init.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/ostree/ot-admin-builtin-os-init.c b/src/ostree/ot-admin-builtin-os-init.c index cb1ec66d..05311532 100644 --- a/src/ostree/ot-admin-builtin-os-init.c +++ b/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; - out: - return ret; + return TRUE; }