packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cli/gpg-sign: Port to C99 style 

General background cleanup.
This commit is contained in:
Colin Walters 2022-06-14 09:50:07 -04:00
parent d9d085dc7b
commit a0ae2f9156
1 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/ostree/ot-builtin-gpg-sign.c
View File

@ -201,62 +201,52 @@ out:
gboolean gboolean
ostree_builtin_gpg_sign (int argc, char **argv,OstreeCommandInvocation *invocation, GCancellable *cancellable, GError **error) ostree_builtin_gpg_sign (int argc, char **argv,OstreeCommandInvocation *invocation, GCancellable *cancellable, GError **error)
{ {
g_autoptr(GOptionContext) context = NULL;
g_autoptr(GOptionContext) context = g_option_context_new ("COMMIT KEY-ID...");
g_autoptr(OstreeRepo) repo = NULL; g_autoptr(OstreeRepo) repo = NULL;
g_autofree char *resolved_commit = NULL;
const char *commit;
char **key_ids;
int n_key_ids, ii;
gboolean ret = FALSE;
context = g_option_context_new ("COMMIT KEY-ID...");
if (!ostree_option_context_parse (context, options, &argc, &argv, invocation, &repo, cancellable, error)) if (!ostree_option_context_parse (context, options, &argc, &argv, invocation, &repo, cancellable, error))
goto out; return FALSE;
if (argc < 2) if (argc < 2)
{ {
usage_error (context, "Need a COMMIT to sign", error); usage_error (context, "Need a COMMIT to sign", error);
goto out; return FALSE;
} }
if (argc < 3) if (argc < 3)
{ {
usage_error (context, "Need at least one GPG KEY-ID to sign with", error); usage_error (context, "Need at least one GPG KEY-ID to sign with", error);
goto out; return FALSE;
} }
commit = argv[1]; const char *commit = argv[1];
key_ids = argv + 2; char **key_ids = argv + 2;
n_key_ids = argc - 2; int n_key_ids = argc - 2;
g_autofree char *resolved_commit = NULL;
if (!ostree_repo_resolve_rev (repo, commit, FALSE, &resolved_commit, error)) if (!ostree_repo_resolve_rev (repo, commit, FALSE, &resolved_commit, error))
goto out; return FALSE;
if (opt_delete) if (opt_delete)
{ {
guint n_deleted = 0; guint n_deleted = 0;
if (delete_signatures (repo, resolved_commit, if (!delete_signatures (repo, resolved_commit,
(const char * const *) key_ids, n_key_ids, (const char * const *) key_ids, n_key_ids,
&n_deleted, cancellable, error)) &n_deleted, cancellable, error))
{ return FALSE;
g_print ("Signatures deleted: %u\n", n_deleted); g_print ("Signatures deleted: %u\n", n_deleted);
ret = TRUE; return TRUE;
} }
goto out; for (int ii = 0; ii < n_key_ids; ii++)
}
for (ii = 0; ii < n_key_ids; ii++)
{ {
if (!ostree_repo_sign_commit (repo, resolved_commit, key_ids[ii], if (!ostree_repo_sign_commit (repo, resolved_commit, key_ids[ii],
opt_gpg_homedir, cancellable, error)) opt_gpg_homedir, cancellable, error))
goto out; return FALSE;
} }
ret = TRUE; return TRUE;
out:
return ret;
} }