From 6b089304bf3cd916d32e5a5d47366183ff1d9a3e Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 5 Aug 2016 07:08:14 -0400 Subject: [PATCH] repo: Drop more internally unused GFile members I forgot to actually remove `config_file` in the previous commit, the txn lock hasn't been used in a long time, and for the uncompressed cache, everything uses the fd already. Closes: #433 Approved by: giuseppe --- src/libostree/ostree-repo-private.h | 3 --- src/libostree/ostree-repo.c | 4 ---- 2 files changed, 7 deletions(-) diff --git a/src/libostree/ostree-repo-private.h b/src/libostree/ostree-repo-private.h index e20e7455..92d8a084 100644 --- a/src/libostree/ostree-repo-private.h +++ b/src/libostree/ostree-repo-private.h @@ -75,13 +75,10 @@ struct OstreeRepo { char *cache_dir; int objects_dir_fd; GFile *deltas_dir; - GFile *uncompressed_objects_dir; int uncompressed_objects_dir_fd; - GFile *config_file; GFile *sysroot_dir; char *remotes_config_dir; - GFile *transaction_lock_path; GHashTable *txn_refs; GMutex txn_stats_lock; OstreeRepoTransactionStats txn_stats; diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index 27b16fe2..62415f06 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -523,14 +523,11 @@ ostree_repo_finalize (GObject *object) if (self->objects_dir_fd != -1) (void) close (self->objects_dir_fd); g_clear_object (&self->deltas_dir); - g_clear_object (&self->uncompressed_objects_dir); if (self->uncompressed_objects_dir_fd != -1) (void) close (self->uncompressed_objects_dir_fd); g_clear_object (&self->sysroot_dir); g_free (self->remotes_config_dir); - g_clear_object (&self->transaction_lock_path); - if (self->loose_object_devino_hash) g_hash_table_destroy (self->loose_object_devino_hash); if (self->updated_uncompressed_dirs) @@ -611,7 +608,6 @@ ostree_repo_constructed (GObject *object) self->tmp_dir = g_file_resolve_relative_path (self->repodir, "tmp"); self->deltas_dir = g_file_get_child (self->repodir, "deltas"); - self->uncompressed_objects_dir = g_file_get_child (self->repodir, "uncompressed-objects-cache"); /* Ensure the "sysroot-path" property is set. */ if (self->sysroot_dir == NULL)