From 69cf28db0dfa175884c9c41fc3f329b051e0a9c5 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 14 May 2023 17:00:33 +0200 Subject: libio: remove device number from dir_iterator_t, add flag field Signed-off-by: David Oberhollenzer --- lib/io/src/dir_tree_iterator.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/io/src/dir_tree_iterator.c') diff --git a/lib/io/src/dir_tree_iterator.c b/lib/io/src/dir_tree_iterator.c index 67d33c3..51d289a 100644 --- a/lib/io/src/dir_tree_iterator.c +++ b/lib/io/src/dir_tree_iterator.c @@ -59,7 +59,7 @@ static bool should_skip(const dir_tree_iterator_t *dir, const dir_entry_t *ent) return true; if ((dir->cfg.flags & DIR_SCAN_ONE_FILESYSTEM)) { - if (ent->dev != ((const dir_iterator_t *)dir)->dev) + if (ent->flags & DIR_ENTRY_FLAG_MOUNT_POINT) return true; } @@ -310,7 +310,6 @@ dir_iterator_t *dir_tree_iterator_create(const char *path, } sqfs_object_init(it, destroy, NULL); - ((dir_iterator_t *)it)->dev = it->top->dir->dev; ((dir_iterator_t *)it)->next = next; ((dir_iterator_t *)it)->read_link = read_link; ((dir_iterator_t *)it)->open_subdir = open_subdir; -- cgit v1.2.3