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

glnx porting: Drop last uses of gs_file_get_basename_cached() 

I apparently missed a few uses in the previous porting.

Closes: #319
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-06-03 10:18:57 -04:00 committed by Atomic Bot
parent b5da2f524c
commit a79c47415a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libostree/ostree-sysroot-deploy.c
View File

@ -756,12 +756,12 @@ selinux_relabel_file (OstreeSysroot *sysroot,
goto out; goto out;
g_ptr_array_add (path_parts, (char*)prefix); g_ptr_array_add (path_parts, (char*)prefix);
g_ptr_array_add (path_parts, (char*)gs_file_get_basename_cached (path)); g_ptr_array_add (path_parts, (char*)g_file_info_get_name (file_info));
if (!relabel_one_path (sysroot, sepolicy, path, file_info, path_parts, if (!relabel_one_path (sysroot, sepolicy, path, file_info, path_parts,
cancellable, error)) cancellable, error))
{ {
g_prefix_error (error, "Relabeling /%s/%s: ", prefix, g_prefix_error (error, "Relabeling /%s/%s: ", prefix,
gs_file_get_basename_cached (path)); g_file_info_get_name (file_info));
goto out; goto out;
} }

4
src/libotutil/ot-gio-utils.c
View File

@ -358,7 +358,7 @@ ot_gfile_replace_contents_fsync (GFile *path,
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
int parent_dfd; int parent_dfd;
const char *target_basename = gs_file_get_basename_cached (path); const char *target_basename = glnx_basename (gs_file_get_path_cached (path));
g_autoptr(GFile) parent = NULL; g_autoptr(GFile) parent = NULL;
parent = g_file_get_parent (path); parent = g_file_get_parent (path);
@ -447,7 +447,7 @@ ot_util_ensure_directory_and_fsync (GFile *dir,
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
int parentfd = -1; int parentfd = -1;
const char *basename = gs_file_get_basename_cached (dir); const char *basename = glnx_basename (gs_file_get_path_cached (dir));
g_autoptr(GFile) parent = g_file_get_parent (dir); g_autoptr(GFile) parent = g_file_get_parent (dir);
again: again: