diff options
author | Philip Withnall <withnall@endlessm.com> | 2017-09-11 14:42:07 +0100 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-10-02 13:39:41 +0000 |
commit | 16aa4d728a5c92fc44d35d29c631708d1cc31eec (patch) | |
tree | 6ce573c00ba8329163f34bed8273cae6c662d419 /src/ostree/ot-builtin-summary.c | |
parent | d1a5652bdd2c1ec55b29a36a67b5278fb7eec876 (diff) | |
download | ostree-16aa4d728a5c92fc44d35d29c631708d1cc31eec.tar.gz |
ostree/summary: Eliminate redundant gotos from error handling path
There is no error handling to do, so just return everywhere instead.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1158
Approved by: cgwalters
Diffstat (limited to 'src/ostree/ot-builtin-summary.c')
-rw-r--r-- | src/ostree/ot-builtin-summary.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/ostree/ot-builtin-summary.c b/src/ostree/ot-builtin-summary.c index aacd9bae..9d04753d 100644 --- a/src/ostree/ot-builtin-summary.c +++ b/src/ostree/ot-builtin-summary.c @@ -83,7 +83,6 @@ build_additional_metadata (const char * const *args, gboolean ostree_builtin_summary (int argc, char **argv, GCancellable *cancellable, GError **error) { - gboolean ret = FALSE; g_autoptr(GOptionContext) context = NULL; g_autoptr(OstreeRepo) repo = NULL; OstreeDumpFlags flags = OSTREE_DUMP_NONE; @@ -91,24 +90,24 @@ ostree_builtin_summary (int argc, char **argv, GCancellable *cancellable, GError context = g_option_context_new ("Manage summary metadata"); if (!ostree_option_context_parse (context, options, &argc, &argv, OSTREE_BUILTIN_FLAG_NONE, &repo, cancellable, error)) - goto out; + return FALSE; if (opt_update) { g_autoptr(GVariant) additional_metadata = NULL; if (!ostree_ensure_repo_writable (repo, error)) - goto out; + return FALSE; if (opt_metadata != NULL) { additional_metadata = build_additional_metadata ((const char * const *) opt_metadata, error); if (additional_metadata == NULL) - goto out; + return FALSE; } if (!ostree_repo_regenerate_summary (repo, additional_metadata, cancellable, error)) - goto out; + return FALSE; if (opt_key_ids) { @@ -117,7 +116,7 @@ ostree_builtin_summary (int argc, char **argv, GCancellable *cancellable, GError opt_gpg_homedir, cancellable, error)) - goto out; + return FALSE; } } else if (opt_view) @@ -129,7 +128,7 @@ ostree_builtin_summary (int argc, char **argv, GCancellable *cancellable, GError summary_data = ot_file_mapat_bytes (repo->repo_dir_fd, "summary", error); if (!summary_data) - goto out; + return FALSE; ot_dump_summary_bytes (summary_data, flags); } @@ -137,10 +136,8 @@ ostree_builtin_summary (int argc, char **argv, GCancellable *cancellable, GError { g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "No option specified; use -u to update summary"); - goto out; + return FALSE; } - ret = TRUE; - out: - return ret; + return TRUE; } |