From 849e6718448793b12d7c6641d59779ca12a2ba08 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 15 Jun 2023 16:21:05 +0200 Subject: libsquashfs: cleanup the flag situation on istream/ostream functions - The ostream creation functions already have flag arguments, but make them an sqfs_u32 instead of int. - Add flag arguments to the istream functions, sanitzie and forward them when opening the handle. Signed-off-by: David Oberhollenzer --- bin/gensquashfs/src/filemap_xattr.c | 2 +- bin/gensquashfs/src/fstree_from_file.c | 2 +- bin/gensquashfs/src/mkfs.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bin/gensquashfs/src') diff --git a/bin/gensquashfs/src/filemap_xattr.c b/bin/gensquashfs/src/filemap_xattr.c index b9a8835..8aa2575 100644 --- a/bin/gensquashfs/src/filemap_xattr.c +++ b/bin/gensquashfs/src/filemap_xattr.c @@ -162,7 +162,7 @@ xattr_open_map_file(const char *path) { sqfs_istream_t *file = NULL; int ret; - ret = sqfs_istream_open_file(&file, path); + ret = sqfs_istream_open_file(&file, path, 0); if (ret) { sqfs_perror(path, NULL, ret); return NULL; diff --git a/bin/gensquashfs/src/fstree_from_file.c b/bin/gensquashfs/src/fstree_from_file.c index c0b4571..ce9fa77 100644 --- a/bin/gensquashfs/src/fstree_from_file.c +++ b/bin/gensquashfs/src/fstree_from_file.c @@ -313,7 +313,7 @@ int fstree_from_file(fstree_t *fs, const char *filename, const char *basepath) sqfs_istream_t *fp; int ret; - ret = sqfs_istream_open_file(&fp, filename); + ret = sqfs_istream_open_file(&fp, filename, 0); if (ret) { sqfs_perror(filename, NULL, ret); return -1; diff --git a/bin/gensquashfs/src/mkfs.c b/bin/gensquashfs/src/mkfs.c index 87ad6fc..39329a6 100644 --- a/bin/gensquashfs/src/mkfs.c +++ b/bin/gensquashfs/src/mkfs.c @@ -160,7 +160,7 @@ int main(int argc, char **argv) } if (opt.sortfile != NULL) { - int ret = sqfs_istream_open_file(&sortfile, opt.sortfile); + int ret = sqfs_istream_open_file(&sortfile, opt.sortfile, 0); if (ret) { sqfs_perror(opt.sortfile, NULL, ret); goto out; -- cgit v1.2.3