From 090f312e4075df4deb0e40dbead304eef05b5fdf Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 16 Aug 2022 17:11:30 -0400 Subject: [PATCH] cli/rev-parse: Port to new code style Prep for future changes. --- src/ostree/ot-builtin-rev-parse.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/ostree/ot-builtin-rev-parse.c b/src/ostree/ot-builtin-rev-parse.c index c4a7ec94..521d2159 100644 --- a/src/ostree/ot-builtin-rev-parse.c +++ b/src/ostree/ot-builtin-rev-parse.c @@ -38,34 +38,24 @@ static GOptionEntry options[] = { gboolean ostree_builtin_rev_parse (int argc, char **argv, OstreeCommandInvocation *invocation, GCancellable *cancellable, GError **error) { - g_autoptr(GOptionContext) context = NULL; + g_autoptr(GOptionContext) context = g_option_context_new ("REV"); g_autoptr(OstreeRepo) repo = NULL; - gboolean ret = FALSE; - const char *rev = "master"; - int i; - g_autofree char *resolved_rev = NULL; - - context = g_option_context_new ("REV"); - if (!ostree_option_context_parse (context, options, &argc, &argv, invocation, &repo, cancellable, error)) - goto out; + return FALSE; if (argc < 2) { ot_util_usage_error (context, "REV must be specified", error); - goto out; + return FALSE; } - for (i = 1; i < argc; i++) + for (gint i = 1; i < argc; i++) { - rev = argv[i]; - g_free (resolved_rev); - resolved_rev = NULL; + const char *rev = argv[i]; + g_autofree char *resolved_rev = NULL; if (!ostree_repo_resolve_rev (repo, rev, FALSE, &resolved_rev, error)) - goto out; + return FALSE; g_print ("%s\n", resolved_rev); } - ret = TRUE; - out: - return ret; + return TRUE; }