aboutsummaryrefslogtreecommitdiff
path: root/bin/gensquashfs/src/mkfs.c
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-10-24 15:49:29 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2023-10-24 15:57:18 +0200
commitc4ab32879df8b5e83b0ebd091ce2c750f53f5633 (patch)
treee59eaea3361c77240f20868a5ce641ec6000982e /bin/gensquashfs/src/mkfs.c
parent3c70940f4c1b8534e1ef547e09050d33b8187122 (diff)
Cleanup: gensquashfs: simplify apply_xattrs
- Pass the option structure along and use it's values rather than passing several of them individually - free() the path ASAP, so we don't have it around anymore when we go into the recursion step - shorten some argument names. Together with the above changes, this allows collapsing some multi line blocks into much simpler constructs. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'bin/gensquashfs/src/mkfs.c')
-rw-r--r--bin/gensquashfs/src/mkfs.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/bin/gensquashfs/src/mkfs.c b/bin/gensquashfs/src/mkfs.c
index 488d015..8019d24 100644
--- a/bin/gensquashfs/src/mkfs.c
+++ b/bin/gensquashfs/src/mkfs.c
@@ -153,10 +153,8 @@ int main(int argc, char **argv)
if (fstree_post_process(&sqfs.fs))
goto out;
- if (apply_xattrs(&sqfs.fs, opt.packdir, sehnd, xattrmap,
- sqfs.xwr, opt.infile == NULL && opt.scan_xattr)) {
+ if (apply_xattrs(&sqfs.fs, &opt, sehnd, xattrmap, sqfs.xwr))
goto out;
- }
if (sortfile != NULL) {
if (fstree_sort_files(&sqfs.fs, sortfile))