From c472d86a770e896339b1ac200ca913676bf38526 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 11 Aug 2019 17:22:02 +0200 Subject: cleanup: replace gensquashfs bool options for dir scan with flags Signed-off-by: David Oberhollenzer --- mkfs/mkfs.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'mkfs/mkfs.c') diff --git a/mkfs/mkfs.c b/mkfs/mkfs.c index b11dce0..8ee2268 100644 --- a/mkfs/mkfs.c +++ b/mkfs/mkfs.c @@ -68,24 +68,11 @@ static int pack_files(data_writer_t *data, fstree_t *fs, options_t *opt) static int read_fstree(fstree_t *fs, options_t *opt) { - unsigned int flags; FILE *fp; int ret; - if (opt->infile == NULL) { - flags = 0; - - if (opt->keep_time) - flags |= DIR_SCAN_KEEP_TIME; - - if (opt->one_filesystem) - flags |= DIR_SCAN_ONE_FILESYSTEM; - - if (opt->keep_xattr) - flags |= DIR_SCAN_READ_XATTR; - - return fstree_from_dir(fs, opt->packdir, flags); - } + if (opt->infile == NULL) + return fstree_from_dir(fs, opt->packdir, opt->dirscan_flags); fp = fopen(opt->infile, "rb"); if (fp == NULL) { -- cgit v1.2.3