1 files changed, 27 insertions, 45 deletions

diff --git a/src/ostree/ot-builtin-admin.c b/src/ostree/ot-builtin-admin.c
index 73e18d15..4d3c3364 100644
--- a/src/ostree/ot-builtin-admin.c
+++ b/src/ostree/ot-builtin-admin.c
@@ -21,64 +21,45 @@
 
 #include "config.h"
 
-#include "ot-main.h"
-#include "ot-builtins.h"
+#include "ostree-repo-file.h"
+#include "ostree.h"
 #include "ot-admin-builtins.h"
 #include "ot-admin-functions.h"
-#include "ostree.h"
-#include "ostree-repo-file.h"
+#include "ot-builtins.h"
+#include "ot-main.h"
 
 #include <glib/gi18n.h>
 
 static OstreeCommand admin_subcommands[] = {
-  { "cleanup", OSTREE_BUILTIN_FLAG_NO_REPO,
-    ot_admin_builtin_cleanup,
+  { "cleanup", OSTREE_BUILTIN_FLAG_NO_REPO, ot_admin_builtin_cleanup,
     "Delete untagged deployments and repository objects" },
-  { "config-diff", OSTREE_BUILTIN_FLAG_NO_REPO,
-    ot_admin_builtin_diff,
+  { "config-diff", OSTREE_BUILTIN_FLAG_NO_REPO, ot_admin_builtin_diff,
     "Diff current /etc configuration versus default" },
-  { "deploy", OSTREE_BUILTIN_FLAG_NO_REPO,
-    ot_admin_builtin_deploy,
+  { "deploy", OSTREE_BUILTIN_FLAG_NO_REPO, ot_admin_builtin_deploy,
     "Checkout revision REFSPEC as the new default deployment" },
   { "finalize-staged", OSTREE_BUILTIN_FLAG_NO_REPO | OSTREE_BUILTIN_FLAG_HIDDEN,
-    ot_admin_builtin_finalize_staged,
-    "Internal command to run at shutdown time" },
+    ot_admin_builtin_finalize_staged, "Internal command to run at shutdown time" },
   { "boot-complete", OSTREE_BUILTIN_FLAG_NO_REPO | OSTREE_BUILTIN_FLAG_HIDDEN,
-    ot_admin_builtin_boot_complete,
-    "Internal command to run at boot after an update was applied" },
-  { "init-fs", OSTREE_BUILTIN_FLAG_NO_REPO,
-     ot_admin_builtin_init_fs,
+    ot_admin_builtin_boot_complete, "Internal command to run at boot after an update was applied" },
+  { "init-fs", OSTREE_BUILTIN_FLAG_NO_REPO, ot_admin_builtin_init_fs,
     "Initialize a root filesystem" },
-  { "instutil", OSTREE_BUILTIN_FLAG_NO_REPO | OSTREE_BUILTIN_FLAG_HIDDEN,
-    ot_admin_builtin_instutil,
+  { "instutil", OSTREE_BUILTIN_FLAG_NO_REPO | OSTREE_BUILTIN_FLAG_HIDDEN, ot_admin_builtin_instutil,
     "Deprecated commands intended for installer programs" },
-  { "os-init", OSTREE_BUILTIN_FLAG_NO_REPO,
-    ot_admin_builtin_os_init,
+  { "os-init", OSTREE_BUILTIN_FLAG_NO_REPO, ot_admin_builtin_os_init,
     "Initialize empty state for given operating system" },
-  { "pin", OSTREE_BUILTIN_FLAG_NO_REPO,
-    ot_admin_builtin_pin,
+  { "pin", OSTREE_BUILTIN_FLAG_NO_REPO, ot_admin_builtin_pin,
     "Change the \"pinning\" state of a deployment" },
-  { "set-origin", OSTREE_BUILTIN_FLAG_NO_REPO,
-    ot_admin_builtin_set_origin,
+  { "set-origin", OSTREE_BUILTIN_FLAG_NO_REPO, ot_admin_builtin_set_origin,
     "Set Origin and create a new origin file" },
-  { "status", OSTREE_BUILTIN_FLAG_NO_REPO,
-    ot_admin_builtin_status,
-    "List deployments" },
-  { "switch", OSTREE_BUILTIN_FLAG_NO_REPO,
-    ot_admin_builtin_switch,
+  { "status", OSTREE_BUILTIN_FLAG_NO_REPO, ot_admin_builtin_status, "List deployments" },
+  { "switch", OSTREE_BUILTIN_FLAG_NO_REPO, ot_admin_builtin_switch,
     "Construct new tree from REFSPEC and deploy it" },
-  { "undeploy", OSTREE_BUILTIN_FLAG_NO_REPO,
-    ot_admin_builtin_undeploy,
-    "Delete deployment INDEX" },
-  { "unlock", OSTREE_BUILTIN_FLAG_NO_REPO,
-    ot_admin_builtin_unlock,
+  { "undeploy", OSTREE_BUILTIN_FLAG_NO_REPO, ot_admin_builtin_undeploy, "Delete deployment INDEX" },
+  { "unlock", OSTREE_BUILTIN_FLAG_NO_REPO, ot_admin_builtin_unlock,
     "Make the current deployment mutable (as a hotfix or development)" },
-  { "upgrade", OSTREE_BUILTIN_FLAG_NO_REPO,
-    ot_admin_builtin_upgrade,
+  { "upgrade", OSTREE_BUILTIN_FLAG_NO_REPO, ot_admin_builtin_upgrade,
     "Construct new tree from current origin and deploy it, if it changed" },
-  { "kargs", OSTREE_BUILTIN_FLAG_NO_REPO,
-    ot_admin_builtin_kargs,
-    "Change kernel arguments" },
+  { "kargs", OSTREE_BUILTIN_FLAG_NO_REPO, ot_admin_builtin_kargs, "Change kernel arguments" },
   { NULL, 0, NULL, NULL }
 };
 
@@ -88,7 +69,7 @@ ostree_admin_option_context_new_with_commands (void)
   OstreeCommand *command = admin_subcommands;
   GOptionContext *context = g_option_context_new ("--print-current-dir|COMMAND");
 
-  g_autoptr(GString) summary = g_string_new ("Builtin \"admin\" Commands:");
+  g_autoptr (GString) summary = g_string_new ("Builtin \"admin\" Commands:");
 
   while (command->name != NULL)
     {
@@ -107,7 +88,8 @@ ostree_admin_option_context_new_with_commands (void)
 }
 
 gboolean
-ostree_builtin_admin (int argc, char **argv, OstreeCommandInvocation *invocation, GCancellable *cancellable, GError **error)
+ostree_builtin_admin (int argc, char **argv, OstreeCommandInvocation *invocation,
+                      GCancellable *cancellable, GError **error)
 {
   gboolean ret = FALSE;
   const char *subcommand_name = NULL;
@@ -154,15 +136,15 @@ ostree_builtin_admin (int argc, char **argv, OstreeCommandInvocation *invocation
 
   if (!subcommand->name)
     {
-      g_autoptr(GOptionContext) context = NULL;
+      g_autoptr (GOptionContext) context = NULL;
       g_autofree char *help = NULL;
 
       context = ostree_admin_option_context_new_with_commands ();
 
       /* This will not return for some options (e.g. --version). */
       if (ostree_admin_option_context_parse (context, NULL, &argc, &argv,
-                                             OSTREE_ADMIN_BUILTIN_FLAG_NO_SYSROOT,
-                                             invocation, NULL, cancellable, error))
+                                             OSTREE_ADMIN_BUILTIN_FLAG_NO_SYSROOT, invocation, NULL,
+                                             cancellable, error))
         {
           if (subcommand_name == NULL)
             {
@@ -190,6 +172,6 @@ ostree_builtin_admin (int argc, char **argv, OstreeCommandInvocation *invocation
     goto out;
 
   ret = TRUE;
- out:
+out:
   return ret;
 }