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

core: Use ot_gfile_ prefix for new local GFile creation function

Browse Source
This commit is contained in:
Colin Walters committed 2011-11-18 08:10:23 -05:00
1 parent 6591e586ed
commit 231f7ed76c
15 files changed
+37 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/libostree/ostree-checkout.c
+3 -3
View File
@@ -205,7 +205,7 @@ run_trigger (OstreeCheckout *self,
{
temp_path = g_build_filename (priv->path, basename, NULL);
rel_temp_path = g_strconcat ("./", basename, NULL);
temp_copy = ot_util_new_file_for_path (temp_path);
temp_copy = ot_gfile_new_for_path (temp_path);
if (!g_file_copy (trigger, temp_copy, 0, NULL, NULL, NULL, error))
goto out;
@@ -310,7 +310,7 @@ ostree_checkout_run_triggers (OstreeCheckout *self,
GFileEnumerator *enumerator = NULL;
triggerdir_path = g_build_filename (LIBEXECDIR, "ostree", "triggers.d", NULL);
triggerdir = ot_util_new_file_for_path (triggerdir_path);
triggerdir = ot_gfile_new_for_path (triggerdir_path);
enumerator = g_file_enumerate_children (triggerdir, OSTREE_GIO_FAST_QUERYINFO,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
@@ -333,7 +333,7 @@ ostree_checkout_run_triggers (OstreeCheckout *self,
if (type == G_FILE_TYPE_REGULAR && g_str_has_suffix (name, ".trigger"))
{
child_path = g_build_filename (triggerdir_path, name, NULL);
child = ot_util_new_file_for_path (child_path);
child = ot_gfile_new_for_path (child_path);
success = check_trigger (self, child, error);
}
src/libostree/ostree-core.c
+4 -4
View File
@@ -685,8 +685,8 @@ unpack_meta (const char *path,
GChecksum *ret_checksum = NULL;
GFileOutputStream *out = NULL;
file = ot_util_new_file_for_path (path);
dest_file = ot_util_new_file_for_path (dest_path);
file = ot_gfile_new_for_path (path);
dest_file = ot_gfile_new_for_path (dest_path);
if (out_checksum)
ret_checksum = g_checksum_new (G_CHECKSUM_SHA256);
@@ -802,7 +802,7 @@ unpack_file (const char *path,
guint64 content_len;
gsize bytes_read;
file = ot_util_new_file_for_path (path);
file = ot_gfile_new_for_path (path);
if (!ostree_parse_packed_file (file, &metadata, &in, NULL, error))
goto out;
@@ -815,7 +815,7 @@ unpack_file (const char *path,
mode = GUINT32_FROM_BE (mode);
content_len = GUINT64_FROM_BE (content_len);
dest_file = ot_util_new_file_for_path (dest_path);
dest_file = ot_gfile_new_for_path (dest_path);
if (out_checksum)
ret_checksum = g_checksum_new (G_CHECKSUM_SHA256);
src/libostree/ostree-repo-file.c
+2 -2
View File
@@ -396,7 +396,7 @@ _ostree_repo_file_nontree_get_local (OstreeRepoFile *self)
checksum = _ostree_repo_file_get_checksum (self);
path = ostree_repo_get_object_path (self->repo, checksum, OSTREE_OBJECT_TYPE_FILE);
ret = ot_util_new_file_for_path (path);
ret = ot_gfile_new_for_path (path);
g_free (path);
return ret;
@@ -703,7 +703,7 @@ get_child_local_file (OstreeRepo *repo,
GFile *ret;
path = ostree_repo_get_object_path (repo, checksum, OSTREE_OBJECT_TYPE_FILE);
ret = ot_util_new_file_for_path (path);
ret = ot_gfile_new_for_path (path);
g_free (path);
return ret;
src/libostree/ostree-repo.c
+9 -9
View File
@@ -134,7 +134,7 @@ ostree_repo_constructor (GType gtype,
g_assert (priv->path != NULL);
priv->repo_file = ot_util_new_file_for_path (priv->path);
priv->repo_file = ot_gfile_new_for_path (priv->path);
priv->tmp_dir = g_file_resolve_relative_path (priv->repo_file, "tmp");
priv->local_heads_dir = g_file_resolve_relative_path (priv->repo_file, "refs/heads");
priv->remote_heads_dir = g_file_resolve_relative_path (priv->repo_file, "refs/remotes");
@@ -610,7 +610,7 @@ write_gvariant_to_tmp (OstreeRepo *self,
}
ret = TRUE;
*out_tmpname = ot_util_new_file_for_path (dest_name);
*out_tmpname = ot_gfile_new_for_path (dest_name);
*out_checksum = checksum;
checksum = NULL;
out:
@@ -704,7 +704,7 @@ import_directory_meta (OstreeRepo *self,
GFile *f = NULL;
GFileInfo *f_info = NULL;
f = ot_util_new_file_for_path (path);
f = ot_gfile_new_for_path (path);
f_info = g_file_query_info (f, OSTREE_GIO_FAST_QUERYINFO,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
@@ -877,7 +877,7 @@ archive_file_trusted (OstreeRepo *self,
char *dest_path = NULL;
char *dest_tmp_path = NULL;
infile = ot_util_new_file_for_path (path);
infile = ot_gfile_new_for_path (path);
dest_path = prepare_dir_for_checksum_get_object_path (self, checksum, objtype, error);
if (!dest_path)
@@ -885,7 +885,7 @@ archive_file_trusted (OstreeRepo *self,
dest_tmp_path = g_strconcat (dest_path, ".tmp", NULL);
outfile = ot_util_new_file_for_path (dest_tmp_path);
outfile = ot_gfile_new_for_path (dest_tmp_path);
out = g_file_replace (outfile, NULL, FALSE, 0, NULL, error);
if (!out)
goto out;
@@ -1218,7 +1218,7 @@ add_one_file_to_tree_and_import (OstreeRepo *self,
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_assert (tree != NULL);
f = ot_util_new_file_for_path (abspath);
f = ot_gfile_new_for_path (abspath);
if (!ostree_checksum_file (f, OSTREE_OBJECT_TYPE_FILE, &checksum, NULL, error))
goto out;
@@ -1624,7 +1624,7 @@ ostree_repo_iter_objects (OstreeRepo *self,
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
g_return_val_if_fail (priv->inited, FALSE);
objectdir = ot_util_new_file_for_path (priv->objects_path);
objectdir = ot_gfile_new_for_path (priv->objects_path);
enumerator = g_file_enumerate_children (objectdir, OSTREE_GIO_FAST_QUERYINFO,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
NULL,
@@ -1684,7 +1684,7 @@ ostree_repo_load_variant (OstreeRepo *self,
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
path = ostree_repo_get_object_path (self, sha256, OSTREE_OBJECT_TYPE_META);
f = ot_util_new_file_for_path (path);
f = ot_gfile_new_for_path (path);
if (!ostree_parse_metadata_file (f, &ret_type, &ret_variant, error))
goto out;
@@ -1722,7 +1722,7 @@ checkout_one_directory (OstreeRepo *self,
GVariant *xattr_variant = NULL;
dest_path = g_build_filename (destination, dirname, NULL);
dest_file = ot_util_new_file_for_path (dest_path);
dest_file = ot_gfile_new_for_path (dest_path);
if (!_ostree_repo_file_get_xattrs (dir, &xattr_variant, NULL, error))
goto out;