From 33d5b6f514c9fbe0b02764f8d999ed1531f23b51 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 30 Apr 2018 11:29:47 -0400 Subject: [PATCH] bin/admin-cleanup: Port to decl-and-initialize style No functional changes. Closes: #1567 Approved by: jlebon --- src/ostree/ot-admin-builtin-cleanup.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/ostree/ot-admin-builtin-cleanup.c b/src/ostree/ot-admin-builtin-cleanup.c index a4753030..875d6fa3 100644 --- a/src/ostree/ot-admin-builtin-cleanup.c +++ b/src/ostree/ot-admin-builtin-cleanup.c @@ -37,21 +37,16 @@ static GOptionEntry options[] = { gboolean ot_admin_builtin_cleanup (int argc, char **argv, OstreeCommandInvocation *invocation, GCancellable *cancellable, GError **error) { - g_autoptr(GOptionContext) context = NULL; + g_autoptr(GOptionContext) context = g_option_context_new (""); + g_autoptr(OstreeSysroot) sysroot = NULL; - gboolean ret = FALSE; - - 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 (!ostree_sysroot_cleanup (sysroot, cancellable, error)) - goto out; + return FALSE; - ret = TRUE; - out: - return ret; + return TRUE; }