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

checkout: Drop internal use of GFile * 

Checkout was one of the first complex code paths I tried to convert to
*at().  I ended up keeping both, because I hit the "xattrs for a
symlink" problem.  Later, Florian gave me a workaround, and we started
using it here, but the GFile * parameters weren't deleted.  They're
not used, so do so now.
This commit is contained in:
Colin Walters 2015-02-20 16:36:02 -05:00
parent 9539408bb3
commit 46bd4657b2
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,6 @@ checkout_file_from_input_at (OstreeRepo *self,
GVariant *xattrs, GVariant *xattrs,
GInputStream *input, GInputStream *input,
int destination_dfd, int destination_dfd,
GFile *destination_parent,
const char *destination_name, const char *destination_name,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
@ -262,7 +261,6 @@ checkout_file_unioning_from_input_at (OstreeRepo *repo,
GVariant *xattrs, GVariant *xattrs,
GInputStream *input, GInputStream *input,
int destination_dfd, int destination_dfd,
GFile *destination_parent,
const char *destination_name, const char *destination_name,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
@ -382,7 +380,6 @@ checkout_one_file_at (OstreeRepo *repo,
GFile *source, GFile *source,
GFileInfo *source_info, GFileInfo *source_info,
int destination_dfd, int destination_dfd,
GFile *destination_parent,
const char *destination_name, const char *destination_name,
OstreeRepoCheckoutMode mode, OstreeRepoCheckoutMode mode,
OstreeRepoCheckoutOverwriteMode overwrite_mode, OstreeRepoCheckoutOverwriteMode overwrite_mode,
@ -508,7 +505,7 @@ checkout_one_file_at (OstreeRepo *repo,
if (overwrite_mode == OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_FILES) if (overwrite_mode == OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_FILES)
{ {
if (!checkout_file_unioning_from_input_at (repo, mode, source_info, xattrs, input, if (!checkout_file_unioning_from_input_at (repo, mode, source_info, xattrs, input,
destination_dfd, destination_parent, destination_dfd,
destination_name, destination_name,
cancellable, error)) cancellable, error))
{ {
@ -519,7 +516,7 @@ checkout_one_file_at (OstreeRepo *repo,
else else
{ {
if (!checkout_file_from_input_at (repo, mode, source_info, xattrs, input, if (!checkout_file_from_input_at (repo, mode, source_info, xattrs, input,
destination_dfd, destination_parent, destination_dfd,
destination_name, destination_name,
cancellable, error)) cancellable, error))
{ {
@ -561,7 +558,6 @@ checkout_tree_at (OstreeRepo *self,
OstreeRepoCheckoutOverwriteMode overwrite_mode, OstreeRepoCheckoutOverwriteMode overwrite_mode,
int destination_parent_fd, int destination_parent_fd,
const char *destination_name, const char *destination_name,
GFile *destination,
OstreeRepoFile *source, OstreeRepoFile *source,
GFileInfo *source_info, GFileInfo *source_info,
GCancellable *cancellable, GCancellable *cancellable,
@ -614,7 +610,7 @@ checkout_tree_at (OstreeRepo *self,
{ {
ret = checkout_one_file_at (self, (GFile *) source, ret = checkout_one_file_at (self, (GFile *) source,
source_info, source_info,
destination_dfd, destination, destination_dfd,
g_file_info_get_name (source_info), g_file_info_get_name (source_info),
mode, TRUE, mode, TRUE,
cancellable, error); cancellable, error);
@ -644,9 +640,8 @@ checkout_tree_at (OstreeRepo *self,
if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY) if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY)
{ {
gs_unref_object GFile *child_destination = g_file_get_child (destination, name);
if (!checkout_tree_at (self, mode, overwrite_mode, if (!checkout_tree_at (self, mode, overwrite_mode,
destination_dfd, name, child_destination, destination_dfd, name,
(OstreeRepoFile*)src_child, file_info, (OstreeRepoFile*)src_child, file_info,
cancellable, error)) cancellable, error))
goto out; goto out;
@ -654,7 +649,7 @@ checkout_tree_at (OstreeRepo *self,
else else
{ {
if (!checkout_one_file_at (self, src_child, file_info, if (!checkout_one_file_at (self, src_child, file_info,
destination_dfd, destination, name, destination_dfd, name,
mode, overwrite_mode, mode, overwrite_mode,
cancellable, error)) cancellable, error))
goto out; goto out;
@ -756,7 +751,6 @@ ostree_repo_checkout_tree (OstreeRepo *self,
return checkout_tree_at (self, mode, overwrite_mode, return checkout_tree_at (self, mode, overwrite_mode,
AT_FDCWD, AT_FDCWD,
gs_file_get_path_cached (destination), gs_file_get_path_cached (destination),
destination,
source, source_info, source, source_info,
cancellable, error); cancellable, error);
} }