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

cli/unlock: Port to C99 style 

General background cleanup.
This commit is contained in:
Colin Walters 2022-06-14 09:50:07 -04:00
parent 588b07e554
commit 4e356d0e8f
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/ostree/ot-admin-builtin-unlock.c
View File

@ -40,33 +40,28 @@ static GOptionEntry options[] = {
gboolean gboolean
ot_admin_builtin_unlock (int argc, char **argv, OstreeCommandInvocation *invocation, GCancellable *cancellable, GError **error) ot_admin_builtin_unlock (int argc, char **argv, OstreeCommandInvocation *invocation, GCancellable *cancellable, GError **error)
{ {
gboolean ret = FALSE; g_autoptr(GOptionContext) context = g_option_context_new ("");
g_autoptr(GOptionContext) context = NULL;
g_autoptr(OstreeSysroot) sysroot = NULL; g_autoptr(OstreeSysroot) sysroot = NULL;
OstreeDeployment *booted_deployment = NULL;
OstreeDeploymentUnlockedState target_state;
context = g_option_context_new ("");
if (!ostree_admin_option_context_parse (context, options, &argc, &argv, if (!ostree_admin_option_context_parse (context, options, &argc, &argv,
OSTREE_ADMIN_BUILTIN_FLAG_SUPERUSER, OSTREE_ADMIN_BUILTIN_FLAG_SUPERUSER,
invocation, &sysroot, cancellable, error)) invocation, &sysroot, cancellable, error))
goto out; return FALSE;
if (argc > 1) if (argc > 1)
{ {
ot_util_usage_error (context, "This command takes no extra arguments", error); ot_util_usage_error (context, "This command takes no extra arguments", error);
goto out; return FALSE;
} }
booted_deployment = ostree_sysroot_require_booted_deployment (sysroot, error); OstreeDeployment *booted_deployment = ostree_sysroot_require_booted_deployment (sysroot, error);
if (!booted_deployment) if (!booted_deployment)
goto out; return FALSE;
OstreeDeploymentUnlockedState target_state;
if (opt_hotfix && opt_transient) if (opt_hotfix && opt_transient)
{ {
glnx_throw (error, "Cannot specify both --hotfix and --transient"); return glnx_throw (error, "Cannot specify both --hotfix and --transient");
goto out;
} }
else if (opt_hotfix) else if (opt_hotfix)
target_state = OSTREE_DEPLOYMENT_UNLOCKED_HOTFIX; target_state = OSTREE_DEPLOYMENT_UNLOCKED_HOTFIX;
@ -77,7 +72,7 @@ ot_admin_builtin_unlock (int argc, char **argv, OstreeCommandInvocation *invocat
if (!ostree_sysroot_deployment_unlock (sysroot, booted_deployment, if (!ostree_sysroot_deployment_unlock (sysroot, booted_deployment,
target_state, cancellable, error)) target_state, cancellable, error))
goto out; return FALSE;
switch (target_state) switch (target_state)
{ {
@ -99,7 +94,5 @@ ot_admin_builtin_unlock (int argc, char **argv, OstreeCommandInvocation *invocat
break; break;
} }
ret = TRUE; return TRUE;
out:
return ret;
} }