From: Colin Walters <walters@verbum.org>
Date: Fri, 26 May 2017 21:53:49 +0000 (-0400)
Subject: cmd: Use autoptr for GKeyFile
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~36^2~60
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9a3555a74b29bf980545b8eb45e0ea2070cf33f7;p=ostree.git

cmd: Use autoptr for GKeyFile

Prep for code style conversion.

Closes: #891
Approved by: jlebon
---

diff --git a/src/ostree/ot-admin-builtin-deploy.c b/src/ostree/ot-admin-builtin-deploy.c
index e59bec8e..709c635e 100644
--- a/src/ostree/ot-admin-builtin-deploy.c
+++ b/src/ostree/ot-admin-builtin-deploy.c
@@ -56,7 +56,7 @@ ot_admin_builtin_deploy (int argc, char **argv, GCancellable *cancellable, GErro
   const char *refspec;
   g_autoptr(GOptionContext) context = NULL;
   glnx_unref_object OstreeSysroot *sysroot = NULL;
-  GKeyFile *origin = NULL;
+  g_autoptr(GKeyFile) origin = NULL;
   glnx_unref_object OstreeRepo *repo = NULL;
   glnx_unref_object OstreeDeployment *new_deployment = NULL;
   glnx_unref_object OstreeDeployment *merge_deployment = NULL;
@@ -171,7 +171,5 @@ ot_admin_builtin_deploy (int argc, char **argv, GCancellable *cancellable, GErro
 
   ret = TRUE;
  out:
-  if (origin)
-    g_key_file_unref (origin);
   return ret;
 }
diff --git a/src/ostree/ot-admin-builtin-switch.c b/src/ostree/ot-admin-builtin-switch.c
index d72aeebd..9df77f05 100644
--- a/src/ostree/ot-admin-builtin-switch.c
+++ b/src/ostree/ot-admin-builtin-switch.c
@@ -58,7 +58,7 @@ ot_admin_builtin_switch (int argc, char **argv, GCancellable *cancellable, GErro
   glnx_unref_object OstreeAsyncProgress *progress = NULL;
   gboolean changed;
   GKeyFile *old_origin;
-  GKeyFile *new_origin = NULL;
+  g_autoptr(GKeyFile) new_origin = NULL;
 
   context = g_option_context_new ("REF - Construct new tree from REF and deploy it");
 
@@ -166,7 +166,5 @@ ot_admin_builtin_switch (int argc, char **argv, GCancellable *cancellable, GErro
 
   ret = TRUE;
  out:
-  if (new_origin)
-    g_key_file_unref (new_origin);
   return ret;
 }