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

lib/commit: Remove duplicated function for filter processing 

The wrapping here is unnecessary, since `_ostree_repo_commit_modifier_apply()`
already does what this function did. Further, the return type was wrong.

Saw this while doing some libarchive work.

Closes: #1104
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-08-23 09:37:44 -04:00 committed by Atomic Bot
parent 11fdca2919
commit 556e2deb93
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2335,6 +2335,10 @@ create_tree_variant_from_hashes (GHashTable *file_checksums,
return serialized_tree; return serialized_tree;
} }
/* If any filtering is set up, perform it, and return modified file info in
* @out_modified_info. Note that if no filtering is applied, @out_modified_info
* will simply be another reference (with incremented refcount) to @file_info.
*/
OstreeRepoCommitFilterResult OstreeRepoCommitFilterResult
_ostree_repo_commit_modifier_apply (OstreeRepo *self, _ostree_repo_commit_modifier_apply (OstreeRepo *self,
OstreeRepoCommitModifier *modifier, OstreeRepoCommitModifier *modifier,
@ -2410,24 +2414,6 @@ ptrarray_path_join (GPtrArray *path)
return g_string_free (path_buf, FALSE); return g_string_free (path_buf, FALSE);
} }
static gboolean
apply_commit_filter (OstreeRepo *self,
OstreeRepoCommitModifier *modifier,
const char *relpath,
GFileInfo *file_info,
GFileInfo **out_modified_info)
{
if (modifier == NULL ||
(modifier->filter == NULL &&
(modifier->flags & OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS) == 0))
{
*out_modified_info = g_object_ref (file_info);
return OSTREE_REPO_COMMIT_FILTER_ALLOW;
}
return _ostree_repo_commit_modifier_apply (self, modifier, relpath, file_info, out_modified_info);
}
static gboolean static gboolean
get_modified_xattrs (OstreeRepo *self, get_modified_xattrs (OstreeRepo *self,
OstreeRepoCommitModifier *modifier, OstreeRepoCommitModifier *modifier,
@ -2564,7 +2550,7 @@ write_directory_content_to_mtree_internal (OstreeRepo *self,
if (modifier != NULL) if (modifier != NULL)
child_relpath = ptrarray_path_join (path); child_relpath = ptrarray_path_join (path);
filter_result = apply_commit_filter (self, modifier, child_relpath, child_info, &modified_info); filter_result = _ostree_repo_commit_modifier_apply (self, modifier, child_relpath, child_info, &modified_info);
if (filter_result != OSTREE_REPO_COMMIT_FILTER_ALLOW) if (filter_result != OSTREE_REPO_COMMIT_FILTER_ALLOW)
{ {
@ -2733,7 +2719,7 @@ write_directory_to_mtree_internal (OstreeRepo *self,
relpath = ptrarray_path_join (path); relpath = ptrarray_path_join (path);
g_autoptr(GFileInfo) modified_info = NULL; g_autoptr(GFileInfo) modified_info = NULL;
filter_result = apply_commit_filter (self, modifier, relpath, child_info, &modified_info); filter_result = _ostree_repo_commit_modifier_apply (self, modifier, relpath, child_info, &modified_info);
if (filter_result == OSTREE_REPO_COMMIT_FILTER_ALLOW) if (filter_result == OSTREE_REPO_COMMIT_FILTER_ALLOW)
{ {
@ -2812,7 +2798,7 @@ write_dfd_iter_to_mtree_internal (OstreeRepo *self,
{ {
relpath = ptrarray_path_join (path); relpath = ptrarray_path_join (path);
filter_result = apply_commit_filter (self, modifier, relpath, child_info, &modified_info); filter_result = _ostree_repo_commit_modifier_apply (self, modifier, relpath, child_info, &modified_info);
} }
else else
{ {