From 3c70940f4c1b8534e1ef547e09050d33b8187122 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Tue, 24 Oct 2023 14:45:36 +0200 Subject: Cleanup: gensquashfs: merge glob scan_directory & fstree_from_dir Signed-off-by: David Oberhollenzer --- bin/gensquashfs/src/mkfs.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'bin/gensquashfs/src/mkfs.h') diff --git a/bin/gensquashfs/src/mkfs.h b/bin/gensquashfs/src/mkfs.h index 437198b..a762966 100644 --- a/bin/gensquashfs/src/mkfs.h +++ b/bin/gensquashfs/src/mkfs.h @@ -104,15 +104,11 @@ int fstree_from_file(fstree_t *fs, const char *filename, const options_t *opt); int fstree_from_file_stream(fstree_t *fs, sqfs_istream_t *file, const options_t *opt); -/* - Recursively scan a directory to build a file system tree. - - Returns 0 on success, prints to stderr on failure. - */ -int fstree_from_dir(fstree_t *fs, sqfs_dir_iterator_t *dir); - int fstree_sort_files(fstree_t *fs, sqfs_istream_t *sortfile); +int scan_directory(fstree_t *fs, sqfs_dir_iterator_t *dir, + size_t prefix_len, const char *file_prefix); + int glob_files(fstree_t *fs, const char *filename, size_t line_num, const sqfs_dir_entry_t *ent, const char *basepath, unsigned int glob_flags, -- cgit v1.2.3