From 454277864812cdd84d8d18783f006d67226aa59e Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 12 Oct 2016 15:21:31 -0400 Subject: [PATCH] tree-wide: Port to g_file_enumerator_iterate() Unlike OSTree, I'm going to assert we can take a hard dependency on the version of GLib that has it. Closes: #483 Approved by: jlebon --- src/libpriv/rpmostree-passwd-util.c | 4 ++-- src/libpriv/rpmostree-postprocess.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libpriv/rpmostree-passwd-util.c b/src/libpriv/rpmostree-passwd-util.c index 67b26dba..892ba517 100644 --- a/src/libpriv/rpmostree-passwd-util.c +++ b/src/libpriv/rpmostree-passwd-util.c @@ -125,8 +125,8 @@ dir_contains_uid_or_gid (GFile *root, GFileInfo *file_info; GFile *child; - if (!gs_file_enumerator_iterate (dir_enum, &file_info, &child, - cancellable, error)) + if (!g_file_enumerator_iterate (dir_enum, &file_info, &child, + cancellable, error)) goto out; if (!file_info) break; diff --git a/src/libpriv/rpmostree-postprocess.c b/src/libpriv/rpmostree-postprocess.c index 68576c2e..3cbf7cf2 100644 --- a/src/libpriv/rpmostree-postprocess.c +++ b/src/libpriv/rpmostree-postprocess.c @@ -198,8 +198,8 @@ find_kernel_and_initramfs_in_bootdir (GFile *bootdir, GFileInfo *file_info; GFile *child; - if (!gs_file_enumerator_iterate (direnum, &file_info, &child, - cancellable, error)) + if (!g_file_enumerator_iterate (direnum, &file_info, &child, + cancellable, error)) goto out; if (!file_info) break; @@ -262,8 +262,8 @@ find_ensure_one_subdirectory (GFile *d, GFileInfo *file_info; GFile *child; - if (!gs_file_enumerator_iterate (direnum, &file_info, &child, - cancellable, error)) + if (!g_file_enumerator_iterate (direnum, &file_info, &child, + cancellable, error)) goto out; if (!file_info) break;