From 0dec1b287cf75e3ed07859f723fc5bc0addf2acd Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 30 Jul 2013 20:56:33 -0400 Subject: [PATCH] core: Reduce API surface for file access This function was only used by internals, make it private. --- src/libostree/ostree-repo-checkout.c | 2 +- src/libostree/ostree-repo-file.c | 4 ++-- src/libostree/ostree-repo-private.h | 8 +++++++ src/libostree/ostree-repo.c | 34 +++++----------------------- src/libostree/ostree-repo.h | 6 ----- 5 files changed, 17 insertions(+), 37 deletions(-) diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c index 63f54d35..51dbedab 100644 --- a/src/libostree/ostree-repo-checkout.c +++ b/src/libostree/ostree-repo-checkout.c @@ -189,7 +189,7 @@ find_loose_for_checkout (OstreeRepo *self, path = ostree_repo_get_object_path (self, checksum, OSTREE_OBJECT_TYPE_FILE); break; case OSTREE_REPO_MODE_ARCHIVE: - path = ostree_repo_get_archive_content_path (self, checksum); + path = _ostree_repo_get_archive_content_path (self, checksum); break; case OSTREE_REPO_MODE_ARCHIVE_Z2: { diff --git a/src/libostree/ostree-repo-file.c b/src/libostree/ostree-repo-file.c index 2b8e2438..352ace7f 100644 --- a/src/libostree/ostree-repo-file.c +++ b/src/libostree/ostree-repo-file.c @@ -24,7 +24,7 @@ #include "otutil.h" #include "ostree-repo-file-enumerator.h" -#include "ostree-repo.h" +#include "ostree-repo-private.h" static void ostree_repo_file_file_iface_init (GFileIface *iface); @@ -365,7 +365,7 @@ ostree_repo_file_tree_get_content_checksum (OstreeRepoFile *self) GFile * ostree_repo_file_nontree_get_local (OstreeRepoFile *self) { - return ostree_repo_get_file_object_path (self->repo, ostree_repo_file_get_checksum (self)); + return _ostree_repo_get_file_object_path (self->repo, ostree_repo_file_get_checksum (self)); } /** diff --git a/src/libostree/ostree-repo-private.h b/src/libostree/ostree-repo-private.h index 40793ab2..30a6b01d 100644 --- a/src/libostree/ostree-repo-private.h +++ b/src/libostree/ostree-repo-private.h @@ -65,6 +65,14 @@ GFile * _ostree_repo_get_uncompressed_object_cache_path (OstreeRepo *self, const char *checksum); +GFile * +_ostree_repo_get_archive_content_path (OstreeRepo *self, + const char *checksum); + +GFile * +_ostree_repo_get_file_object_path (OstreeRepo *self, + const char *checksum); + gboolean _ostree_repo_stage_directory_meta (OstreeRepo *self, GFileInfo *file_info, diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index acc3d157..9e403739 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -422,38 +422,16 @@ ostree_repo_get_parent (OstreeRepo *self) return self->parent_repo; } -/** - * ostree_repo_get_file_object_path: - * @self: - * @checksum: SHA256 checksum string - * - * This function directly retrieves the path of loose objects; it is a - * low level API as one cannot assume that all objects are loose. Use - * higher level API such as ostree_repo_load_file() if possible. - * - * Returns: (transfer full): A new file containing the direct path to a loose object - */ GFile * -ostree_repo_get_file_object_path (OstreeRepo *self, - const char *checksum) +_ostree_repo_get_file_object_path (OstreeRepo *self, + const char *checksum) { return ostree_repo_get_object_path (self, checksum, OSTREE_OBJECT_TYPE_FILE); } -/** - * ostree_repo_get_archive_content_path: - * @self: - * @checksum: SHA256 checksum string - * - * This function directly retrieves the path of loose objects; it is a - * low level API as one cannot assume that all objects are loose. Use - * higher level API such as ostree_repo_load_file() if possible. - * - * Returns: (transfer full): A new file containing the direct path to a loose object - */ GFile * -ostree_repo_get_archive_content_path (OstreeRepo *self, - const char *checksum) +_ostree_repo_get_archive_content_path (OstreeRepo *self, + const char *checksum) { gs_free char *path = NULL; @@ -759,7 +737,7 @@ stage_object (OstreeRepo *self, { gs_unref_object GFile *archive_content_dest = NULL; - archive_content_dest = ostree_repo_get_archive_content_path (self, actual_checksum); + archive_content_dest = _ostree_repo_get_archive_content_path (self, actual_checksum); if (!commit_loose_object_impl (self, raw_temp_file, archive_content_dest, TRUE, cancellable, error)) @@ -2129,7 +2107,7 @@ ostree_repo_load_file (OstreeRepo *self, gs_unref_object GFile *archive_content_path = NULL; gs_unref_object GFileInfo *content_info = NULL; - archive_content_path = ostree_repo_get_archive_content_path (self, checksum); + archive_content_path = _ostree_repo_get_archive_content_path (self, checksum); content_info = g_file_query_info (archive_content_path, OSTREE_GIO_FAST_QUERYINFO, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, cancellable, error); diff --git a/src/libostree/ostree-repo.h b/src/libostree/ostree-repo.h index 5ff232c3..a8fb6cb2 100644 --- a/src/libostree/ostree-repo.h +++ b/src/libostree/ostree-repo.h @@ -69,12 +69,6 @@ GFile * ostree_repo_get_object_path (OstreeRepo *self, const char *checksum, OstreeObjectType type); -GFile * ostree_repo_get_archive_content_path (OstreeRepo *self, - const char *checksum); - -GFile * ostree_repo_get_file_object_path (OstreeRepo *self, - const char *checksum); - gboolean ostree_repo_prepare_transaction (OstreeRepo *self, gboolean enable_commit_hardlink_scan, gboolean *out_transaction_resume,