6 files changed, 12 insertions, 12 deletions
diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c
index f75def1f..233da0f2 100644
--- a/src/ostree/ot-builtin-commit.c
+++ b/src/ostree/ot-builtin-commit.c
@@ -95,7 +95,7 @@ parse_statoverride_file (GHashTable   **out_mode_add,
   gboolean ret = FALSE;
   gsize len;
   char **iter = NULL; /* nofree */
-  gs_unref_hashtable GHashTable *ret_hash = NULL;
+  g_autoptr(GHashTable) ret_hash = NULL;
   g_autoptr(GFile) path = NULL;
   g_autofree char *contents = NULL;
   char **lines = NULL;
@@ -303,7 +303,7 @@ ostree_builtin_commit (int argc, char **argv, GCancellable *cancellable, GError
   gs_unref_variant GVariant *detached_metadata = NULL;
   glnx_unref_object OstreeMutableTree *mtree = NULL;
   g_autofree char *tree_type = NULL;
-  gs_unref_hashtable GHashTable *mode_adds = NULL;
+  g_autoptr(GHashTable) mode_adds = NULL;
   OstreeRepoCommitModifierFlags flags = 0;
   OstreeRepoCommitModifier *modifier = NULL;
   OstreeRepoTransactionStats stats;
diff --git a/src/ostree/ot-builtin-diff.c b/src/ostree/ot-builtin-diff.c
index 385d9103..8e2d237a 100644
--- a/src/ostree/ot-builtin-diff.c
+++ b/src/ostree/ot-builtin-diff.c
@@ -180,9 +180,9 @@ ostree_builtin_diff (int argc, char **argv, GCancellable *cancellable, GError **
 
   if (opt_stats)
     {
-      gs_unref_hashtable GHashTable *reachable_a = NULL;
-      gs_unref_hashtable GHashTable *reachable_b = NULL;
-      gs_unref_hashtable GHashTable *reachable_intersection = NULL;
+      g_autoptr(GHashTable) reachable_a = NULL;
+      g_autoptr(GHashTable) reachable_b = NULL;
+      g_autoptr(GHashTable) reachable_intersection = NULL;
       g_autofree char *rev_a = NULL;
       g_autofree char *rev_b = NULL;
       g_autofree char *size = NULL;
diff --git a/src/ostree/ot-builtin-fsck.c b/src/ostree/ot-builtin-fsck.c
index e13c1a8e..86ca3937 100644
--- a/src/ostree/ot-builtin-fsck.c
+++ b/src/ostree/ot-builtin-fsck.c
@@ -185,7 +185,7 @@ fsck_reachable_objects_from_commits (OstreeRepo            *repo,
   gboolean ret = FALSE;
   GHashTableIter hash_iter;
   gpointer key, value;
-  gs_unref_hashtable GHashTable *reachable_objects = NULL;
+  g_autoptr(GHashTable) reachable_objects = NULL;
   guint i;
   guint mod;
   guint count;
@@ -244,8 +244,8 @@ ostree_builtin_fsck (int argc, char **argv, GCancellable *cancellable, GError **
   gpointer key, value;
   gboolean found_corruption = FALSE;
   guint n_partial = 0;
-  gs_unref_hashtable GHashTable *objects = NULL;
-  gs_unref_hashtable GHashTable *commits = NULL;
+  g_autoptr(GHashTable) objects = NULL;
+  g_autoptr(GHashTable) commits = NULL;
 
   context = g_option_context_new ("- Check the repository for consistency");
 
diff --git a/src/ostree/ot-builtin-pull-local.c b/src/ostree/ot-builtin-pull-local.c
index 993c53ec..ec0c0042 100644
--- a/src/ostree/ot-builtin-pull-local.c
+++ b/src/ostree/ot-builtin-pull-local.c
@@ -51,7 +51,7 @@ ostree_builtin_pull_local (int argc, char **argv, GCancellable *cancellable, GEr
   g_autofree char *src_repo_uri = NULL;
   glnx_unref_object OstreeAsyncProgress *progress = NULL;
   gs_unref_ptrarray GPtrArray *refs_to_fetch = NULL;
-  gs_unref_hashtable GHashTable *source_objects = NULL;
+  g_autoptr(GHashTable) source_objects = NULL;
 
   context = g_option_context_new ("SRC_REPO [REFS...] -  Copy data from SRC_REPO");
 
@@ -88,7 +88,7 @@ ostree_builtin_pull_local (int argc, char **argv, GCancellable *cancellable, GEr
     {
       g_autoptr(GFile) src_repo_path = g_file_new_for_path (src_repo_arg);
       glnx_unref_object OstreeRepo *src_repo = ostree_repo_new (src_repo_path);
-      gs_unref_hashtable GHashTable *refs_to_clone = NULL;
+      g_autoptr(GHashTable) refs_to_clone = NULL;
 
       refs_to_fetch = g_ptr_array_new_with_free_func (g_free);
 
diff --git a/src/ostree/ot-builtin-refs.c b/src/ostree/ot-builtin-refs.c
index 95879900..d5d6f49e 100644
--- a/src/ostree/ot-builtin-refs.c
+++ b/src/ostree/ot-builtin-refs.c
@@ -41,7 +41,7 @@ ostree_builtin_refs (int argc, char **argv, GCancellable *cancellable, GError **
   GOptionContext *context;
   glnx_unref_object OstreeRepo *repo = NULL;
   const char *refspec_prefix = NULL;
-  gs_unref_hashtable GHashTable *refs = NULL;
+  g_autoptr(GHashTable) refs = NULL;
   GHashTableIter hashiter;
   gpointer hashkey, hashvalue;
 
diff --git a/src/ostree/ot-builtin-reset.c b/src/ostree/ot-builtin-reset.c
index eed44c07..61f233f7 100644
--- a/src/ostree/ot-builtin-reset.c
+++ b/src/ostree/ot-builtin-reset.c
@@ -37,7 +37,7 @@ find_current_ref (OstreeRepo   *repo,
                   GCancellable *cancellable,
                   GError      **error)
 {
-  gs_unref_hashtable GHashTable *refs = NULL;
+  g_autoptr(GHashTable) refs = NULL;
   gchar *ret;
 
   if (!ostree_repo_list_refs (repo, NULL, &refs, cancellable, error))