packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Reduce API surface for file access 

This function was only used by internals, make it private.
This commit is contained in:
Colin Walters 2013-07-30 20:56:33 -04:00
parent 2e3f893b73
commit 0dec1b287c
5 changed files with 17 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libostree/ostree-repo-checkout.c
View File

@ -189,7 +189,7 @@ find_loose_for_checkout (OstreeRepo *self,
path = ostree_repo_get_object_path (self, checksum, OSTREE_OBJECT_TYPE_FILE); path = ostree_repo_get_object_path (self, checksum, OSTREE_OBJECT_TYPE_FILE);
break; break;
case OSTREE_REPO_MODE_ARCHIVE: case OSTREE_REPO_MODE_ARCHIVE:
path = ostree_repo_get_archive_content_path (self, checksum); path = _ostree_repo_get_archive_content_path (self, checksum);
break; break;
case OSTREE_REPO_MODE_ARCHIVE_Z2: case OSTREE_REPO_MODE_ARCHIVE_Z2:
{ {

4
src/libostree/ostree-repo-file.c
View File

@ -24,7 +24,7 @@
#include "otutil.h" #include "otutil.h"
#include "ostree-repo-file-enumerator.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); static void ostree_repo_file_file_iface_init (GFileIface *iface);
@ -365,7 +365,7 @@ ostree_repo_file_tree_get_content_checksum (OstreeRepoFile *self)
GFile * GFile *
ostree_repo_file_nontree_get_local (OstreeRepoFile *self) 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));
} }
/** /**

8
src/libostree/ostree-repo-private.h
View File

@ -65,6 +65,14 @@ GFile *
_ostree_repo_get_uncompressed_object_cache_path (OstreeRepo *self, _ostree_repo_get_uncompressed_object_cache_path (OstreeRepo *self,
const char *checksum); 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 gboolean
_ostree_repo_stage_directory_meta (OstreeRepo *self, _ostree_repo_stage_directory_meta (OstreeRepo *self,
GFileInfo *file_info, GFileInfo *file_info,

34
src/libostree/ostree-repo.c
View File

@ -422,38 +422,16 @@ ostree_repo_get_parent (OstreeRepo *self)
return self->parent_repo; 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 * GFile *
ostree_repo_get_file_object_path (OstreeRepo *self, _ostree_repo_get_file_object_path (OstreeRepo *self,
const char *checksum) const char *checksum)
{ {
return ostree_repo_get_object_path (self, checksum, OSTREE_OBJECT_TYPE_FILE); 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 * GFile *
ostree_repo_get_archive_content_path (OstreeRepo *self, _ostree_repo_get_archive_content_path (OstreeRepo *self,
const char *checksum) const char *checksum)
{ {
gs_free char *path = NULL; gs_free char *path = NULL;
@ -759,7 +737,7 @@ stage_object (OstreeRepo *self,
{ {
gs_unref_object GFile *archive_content_dest = NULL; 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, if (!commit_loose_object_impl (self, raw_temp_file, archive_content_dest, TRUE,
cancellable, error)) cancellable, error))
@ -2129,7 +2107,7 @@ ostree_repo_load_file (OstreeRepo *self,
gs_unref_object GFile *archive_content_path = NULL; gs_unref_object GFile *archive_content_path = NULL;
gs_unref_object GFileInfo *content_info = 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, content_info = g_file_query_info (archive_content_path, OSTREE_GIO_FAST_QUERYINFO,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
cancellable, error); cancellable, error);

6
src/libostree/ostree-repo.h
View File

@ -69,12 +69,6 @@ GFile * ostree_repo_get_object_path (OstreeRepo *self,
const char *checksum, const char *checksum,
OstreeObjectType type); 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 ostree_repo_prepare_transaction (OstreeRepo *self,
gboolean enable_commit_hardlink_scan, gboolean enable_commit_hardlink_scan,
gboolean *out_transaction_resume, gboolean *out_transaction_resume,