From a79c47415ac504210d2820eb2d57c0eccb9d1c40 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 3 Jun 2016 10:18:57 -0400 Subject: [PATCH] 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 --- src/libostree/ostree-sysroot-deploy.c | 4 ++-- src/libotutil/ot-gio-utils.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c index 0740b2e1..f0e7ecca 100644 --- a/src/libostree/ostree-sysroot-deploy.c +++ b/src/libostree/ostree-sysroot-deploy.c @@ -756,12 +756,12 @@ selinux_relabel_file (OstreeSysroot *sysroot, goto out; 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, cancellable, error)) { g_prefix_error (error, "Relabeling /%s/%s: ", prefix, - gs_file_get_basename_cached (path)); + g_file_info_get_name (file_info)); goto out; } diff --git a/src/libotutil/ot-gio-utils.c b/src/libotutil/ot-gio-utils.c index 6541a321..a9da4504 100644 --- a/src/libotutil/ot-gio-utils.c +++ b/src/libotutil/ot-gio-utils.c @@ -358,7 +358,7 @@ ot_gfile_replace_contents_fsync (GFile *path, { gboolean ret = FALSE; 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; parent = g_file_get_parent (path); @@ -447,7 +447,7 @@ ot_util_ensure_directory_and_fsync (GFile *dir, { gboolean ret = FALSE; 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); again: