libglnx porting: Port "load utf8 file" contents API callers

Closes: #312
Approved by: giuseppe
This commit is contained in:
Colin Walters authored and Atomic Bot committed 2016-05-30 11:33:28 +00:00
1 parent 4929ab4033
commit 33047d5d4f
4 files changed
+8 -4

No files matched your search

+2 -1
View File
@@ -138,7 +138,8 @@ _ostree_bootloader_syslinux_write_config (OstreeBootloader *bootloader,
bootversion);
/* This should follow the symbolic link to the current bootversion. */
config_contents = gs_file_load_contents_utf8 (self->config_path, cancellable, error);
config_contents = glnx_file_get_contents_utf8_at (AT_FDCWD, gs_file_get_path_cached (self->config_path), NULL,
cancellable, error);
if (!config_contents)
goto out;
+2 -1
View File
@@ -113,7 +113,8 @@ _ostree_bootloader_uboot_write_config (OstreeBootloader *bootloader,
g_autoptr(GPtrArray) new_lines = NULL;
/* This should follow the symbolic link to the current bootversion. */
config_contents = gs_file_load_contents_utf8 (self->config_path, cancellable, error);
config_contents = glnx_file_get_contents_utf8_at (AT_FDCWD, gs_file_get_path_cached (self->config_path), NULL,
cancellable, error);
if (!config_contents)
return FALSE;
+2 -1
View File
@@ -254,7 +254,8 @@ ot_gfile_load_contents_utf8_allow_noent (GFile *path,
GError *temp_error = NULL;
g_autofree char *ret_contents = NULL;
ret_contents = gs_file_load_contents_utf8 (path, cancellable, &temp_error);
ret_contents = glnx_file_get_contents_utf8_at (AT_FDCWD, gs_file_get_path_cached (path), NULL,
cancellable, &temp_error);
if (!ret_contents)
{
if (g_error_matches (temp_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
+2 -1
View File
@@ -101,7 +101,8 @@ ot_editor_prompt (OstreeRepo *repo,
goto out;
}
ret = gs_file_load_contents_utf8 (file, cancellable, error);
ret = glnx_file_get_contents_utf8_at (AT_FDCWD, gs_file_get_path_cached (file), NULL,
cancellable, error);
out:
if (file)