Switch to libgsystem file reading API
More draining common utilities into libgsystem.
This commit is contained in:
parent
f3d765c903
commit
1ac307e6b8
|
|
@ -1 +1 @@
|
||||||
Subproject commit ab2588da8442fc6135af13ee624dd91b73a7051c
|
Subproject commit eb4cecbc1528e1d1bdd99298d6f58768c6642b24
|
||||||
|
|
@ -233,7 +233,7 @@ parse_rev_file (OstreeRepo *self,
|
||||||
GError *temp_error = NULL;
|
GError *temp_error = NULL;
|
||||||
ot_lfree char *rev = NULL;
|
ot_lfree char *rev = NULL;
|
||||||
|
|
||||||
if (!ot_gfile_load_contents_utf8 (f, &rev, NULL, NULL, &temp_error))
|
if ((rev = gs_file_load_contents_utf8 (f, NULL, &temp_error)) == NULL)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (rev == NULL)
|
if (rev == NULL)
|
||||||
|
|
@ -419,7 +419,7 @@ ostree_repo_resolve_rev (OstreeRepo *self,
|
||||||
|
|
||||||
if (child)
|
if (child)
|
||||||
{
|
{
|
||||||
if (!ot_gfile_load_contents_utf8 (child, &ret_rev, NULL, NULL, &temp_error))
|
if ((ret_rev = gs_file_load_contents_utf8 (child, NULL, &temp_error)) == NULL)
|
||||||
{
|
{
|
||||||
g_propagate_error (error, temp_error);
|
g_propagate_error (error, temp_error);
|
||||||
g_prefix_error (error, "Couldn't open ref '%s': ", gs_file_get_path_cached (child));
|
g_prefix_error (error, "Couldn't open ref '%s': ", gs_file_get_path_cached (child));
|
||||||
|
|
|
||||||
|
|
@ -133,36 +133,6 @@ ot_gfile_get_child_build_path (GFile *parent,
|
||||||
return g_file_resolve_relative_path (parent, path);
|
return g_file_resolve_relative_path (parent, path);
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
|
||||||
ot_gfile_load_contents_utf8 (GFile *file,
|
|
||||||
char **out_contents,
|
|
||||||
char **out_etag,
|
|
||||||
GCancellable *cancellable,
|
|
||||||
GError **error)
|
|
||||||
{
|
|
||||||
gboolean ret = FALSE;
|
|
||||||
gsize len;
|
|
||||||
ot_lfree char *ret_contents = NULL;
|
|
||||||
ot_lfree char *ret_etag = NULL;
|
|
||||||
|
|
||||||
if (!g_file_load_contents (file, cancellable, &ret_contents, &len, &ret_etag, error))
|
|
||||||
goto out;
|
|
||||||
if (!g_utf8_validate (ret_contents, len, NULL))
|
|
||||||
{
|
|
||||||
g_set_error (error,
|
|
||||||
G_IO_ERROR,
|
|
||||||
G_IO_ERROR_INVALID_DATA,
|
|
||||||
"Invalid UTF-8");
|
|
||||||
goto out;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = TRUE;
|
|
||||||
ot_transfer_out_value (out_contents, &ret_contents);
|
|
||||||
ot_transfer_out_value (out_etag, &ret_etag);
|
|
||||||
out:
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
cp_internal (GFile *src,
|
cp_internal (GFile *src,
|
||||||
GFile *dest,
|
GFile *dest,
|
||||||
|
|
|
||||||
|
|
@ -42,13 +42,6 @@ GFile *ot_gfile_get_child_strconcat (GFile *parent, const char *first, ...) G_GN
|
||||||
|
|
||||||
GFile *ot_gfile_get_child_build_path (GFile *parent, const char *first, ...) G_GNUC_NULL_TERMINATED;
|
GFile *ot_gfile_get_child_build_path (GFile *parent, const char *first, ...) G_GNUC_NULL_TERMINATED;
|
||||||
|
|
||||||
gboolean ot_gfile_load_contents_utf8 (GFile *file,
|
|
||||||
char **contents_out,
|
|
||||||
char **etag_out,
|
|
||||||
GCancellable *cancellable,
|
|
||||||
GError **error);
|
|
||||||
|
|
||||||
|
|
||||||
gboolean ot_gio_shutil_cp_a (GFile *src,
|
gboolean ot_gio_shutil_cp_a (GFile *src,
|
||||||
GFile *dest,
|
GFile *dest,
|
||||||
GCancellable *cancellable,
|
GCancellable *cancellable,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue