From f572a1ed601267438c34c61a201ae1ab051da7a3 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sat, 15 Jul 2023 14:51:20 +0200 Subject: Refactor: rename dir_iterator_t to sqfs_dir_iterator_t Signed-off-by: David Oberhollenzer --- bin/gensquashfs/src/fstree_from_dir.c | 2 +- bin/gensquashfs/src/glob.c | 2 +- bin/gensquashfs/src/mkfs.c | 2 +- bin/gensquashfs/src/mkfs.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bin/gensquashfs') diff --git a/bin/gensquashfs/src/fstree_from_dir.c b/bin/gensquashfs/src/fstree_from_dir.c index fe0a022..cbdc270 100644 --- a/bin/gensquashfs/src/fstree_from_dir.c +++ b/bin/gensquashfs/src/fstree_from_dir.c @@ -6,7 +6,7 @@ */ #include "mkfs.h" -int fstree_from_dir(fstree_t *fs, dir_iterator_t *dir) +int fstree_from_dir(fstree_t *fs, sqfs_dir_iterator_t *dir) { for (;;) { sqfs_dir_entry_t *ent = NULL; diff --git a/bin/gensquashfs/src/glob.c b/bin/gensquashfs/src/glob.c index 3e2eabc..dbe93a2 100644 --- a/bin/gensquashfs/src/glob.c +++ b/bin/gensquashfs/src/glob.c @@ -69,7 +69,7 @@ int glob_files(fstree_t *fs, const char *filename, size_t line_num, split_line_t *sep) { bool first_type_flag = true; - dir_iterator_t *dir = NULL; + sqfs_dir_iterator_t *dir = NULL; char *prefix = NULL; dir_tree_cfg_t cfg; tree_node_t *root; diff --git a/bin/gensquashfs/src/mkfs.c b/bin/gensquashfs/src/mkfs.c index 39329a6..a178066 100644 --- a/bin/gensquashfs/src/mkfs.c +++ b/bin/gensquashfs/src/mkfs.c @@ -168,7 +168,7 @@ int main(int argc, char **argv) } if (opt.infile == NULL) { - dir_iterator_t *dir = NULL; + sqfs_dir_iterator_t *dir = NULL; dir_tree_cfg_t cfg; int ret; diff --git a/bin/gensquashfs/src/mkfs.h b/bin/gensquashfs/src/mkfs.h index 3378c05..5c5f02c 100644 --- a/bin/gensquashfs/src/mkfs.h +++ b/bin/gensquashfs/src/mkfs.h @@ -112,7 +112,7 @@ int fstree_from_file_stream(fstree_t *fs, sqfs_istream_t *file, Returns 0 on success, prints to stderr on failure. */ -int fstree_from_dir(fstree_t *fs, dir_iterator_t *dir); +int fstree_from_dir(fstree_t *fs, sqfs_dir_iterator_t *dir); int fstree_sort_files(fstree_t *fs, sqfs_istream_t *sortfile); -- cgit v1.2.3