app/db: Refactor booted deployment loading into a helper

Author: kairosci

src/app/rpmostree-db-builtin-diff.cxx

@@ -145,6 +145,29 @@ print_deployment_diff (OstreeRepo *repo, const char *from_desc, OstreeDeployment
   return print_diff (repo, from_desc, from_checksum, to_desc, to_checksum, cancellable, error);
 }
 
+static gboolean
+load_booted_deployment (const char *sysroot_path,
+                        OstreeSysroot **out_sysroot,
+                        OstreeDeployment **out_booted,
+                        GCancellable *cancellable,
+                        GError **error)
+{
+  g_autoptr (GFile) sysroot_file = g_file_new_for_path (sysroot_path);
+  g_autoptr (OstreeSysroot) sysroot = ostree_sysroot_new (sysroot_file);
+  if (!ostree_sysroot_load (sysroot, cancellable, error))
+    return FALSE;
+
+  OstreeDeployment *booted = ostree_sysroot_get_booted_deployment (sysroot);
+  if (!booted)
+    return glnx_throw (error, "Not booted into any deployment");
+
+  if (out_sysroot)
+    *out_sysroot = (OstreeSysroot*) g_steal_pointer (&sysroot);
+  if (out_booted)
+    *out_booted = booted;
+  return TRUE;
+}
+
 gboolean
 rpmostree_db_builtin_diff (int argc, char **argv, RpmOstreeCommandInvocation *invocation,
                            GCancellable *cancellable, GError **error)
@@ -228,15 +251,11 @@ rpmostree_db_builtin_diff (int argc, char **argv, RpmOstreeCommandInvocation *in
 
       if (argc < 1)
         {
-          g_autoptr (GFile) sysroot_file = g_file_new_for_path (sysroot_path);
-          g_autoptr (OstreeSysroot) sysroot = ostree_sysroot_new (sysroot_file);
-          if (!ostree_sysroot_load (sysroot, cancellable, error))
+          g_autoptr (OstreeSysroot) sysroot = NULL;
+          OstreeDeployment *booted = NULL;
+          if (!load_booted_deployment (sysroot_path, &sysroot, &booted, cancellable, error))
             return FALSE;
 
-          OstreeDeployment *booted = ostree_sysroot_get_booted_deployment (sysroot);
-          if (!booted)
-            return glnx_throw (error, "Not booted into any deployment");
-
           from_desc = "booted deployment";
           if (!get_checksum_from_deployment (repo, booted, &from_checksum, error))
             return FALSE;
@@ -252,15 +271,11 @@ rpmostree_db_builtin_diff (int argc, char **argv, RpmOstreeCommandInvocation *in
     {
       /* find booted deployment */
       const char *sysroot_path = opt_sysroot ?: "/";
-      g_autoptr (GFile) sysroot_file = g_file_new_for_path (sysroot_path);
-      g_autoptr (OstreeSysroot) sysroot = ostree_sysroot_new (sysroot_file);
-      if (!ostree_sysroot_load (sysroot, cancellable, error))
+      g_autoptr (OstreeSysroot) sysroot = NULL;
+      OstreeDeployment *booted = NULL;
+      if (!load_booted_deployment (sysroot_path, &sysroot, &booted, cancellable, error))
         return FALSE;
 
-      OstreeDeployment *booted = ostree_sysroot_get_booted_deployment (sysroot);
-      if (!booted)
-        return glnx_throw (error, "Not booted into any deployment");
-
       if (argc < 2)
         {
           /* diff booted against pending or rollback deployment */