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

lib/commit: Make -path commit helper API private 

It's no longer called directly by the pull code, so make it static.

The goal here is to have the pull and local-fs commit paths use higher level
more efficient APIs, and eventually make those APIs public.

Closes: #1257
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-10-09 10:05:20 -04:00 committed by Atomic Bot
parent bb51a43d81
commit 3e3d28632d
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libostree/ostree-repo-commit.c
View File

@ -164,13 +164,13 @@ _ostree_repo_commit_tmpf_final (OstreeRepo *self,
/* Given a dfd+path combination (may be regular file or symlink), /* Given a dfd+path combination (may be regular file or symlink),
* rename it into place. * rename it into place.
*/ */
gboolean static gboolean
_ostree_repo_commit_path_final (OstreeRepo *self, commit_path_final (OstreeRepo *self,
const char *checksum, const char *checksum,
OstreeObjectType objtype, OstreeObjectType objtype,
OtCleanupUnlinkat *tmp_path, OtCleanupUnlinkat *tmp_path,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
/* The final renameat() */ /* The final renameat() */
char tmpbuf[_OSTREE_LOOSE_PATH_MAX]; char tmpbuf[_OSTREE_LOOSE_PATH_MAX];
@ -746,9 +746,8 @@ write_content_object (OstreeRepo *self,
g_assert_not_reached (); g_assert_not_reached ();
} }
if (!_ostree_repo_commit_path_final (self, actual_checksum, OSTREE_OBJECT_TYPE_FILE, if (!commit_path_final (self, actual_checksum, OSTREE_OBJECT_TYPE_FILE,
&tmp_unlinker, &tmp_unlinker, cancellable, error))
cancellable, error))
return FALSE; return FALSE;
} }
else else

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

@ -365,14 +365,6 @@ _ostree_repo_commit_tmpf_final (OstreeRepo *self,
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
gboolean
_ostree_repo_commit_path_final (OstreeRepo *self,
const char *checksum,
OstreeObjectType objtype,
OtCleanupUnlinkat *tmp_path,
GCancellable *cancellable,
GError **error);
gboolean gboolean
_ostree_repo_open_content_bare (OstreeRepo *self, _ostree_repo_open_content_bare (OstreeRepo *self,
const char *checksum, const char *checksum,