diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-06-15 15:16:03 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-06-15 15:16:03 +0200 |
| commit | 484cd01590ec488cca1f8a5c7c76cd223609e299 (patch) | |
| tree | 0e3bc268688c2feb8773871a43381a998ce846e7 /bin/gensquashfs | |
| parent | 8cf84b4995552bad4e77eb795e36c0b1d65a720a (diff) | |
Migrate file istream/ostream from libio to libsquashfs
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'bin/gensquashfs')
| -rw-r--r-- | bin/gensquashfs/src/filemap_xattr.c | 2 | ||||
| -rw-r--r-- | bin/gensquashfs/src/fstree_from_file.c | 2 | ||||
| -rw-r--r-- | bin/gensquashfs/src/mkfs.c | 2 | ||||
| -rw-r--r-- | bin/gensquashfs/src/mkfs.h | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/bin/gensquashfs/src/filemap_xattr.c b/bin/gensquashfs/src/filemap_xattr.c index 8843c46..b9a8835 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 = istream_open_file(&file, path); + ret = sqfs_istream_open_file(&file, path); 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 f392b34..c0b4571 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 = istream_open_file(&fp, filename); + ret = sqfs_istream_open_file(&fp, filename); if (ret) { sqfs_perror(filename, NULL, ret); return -1; diff --git a/bin/gensquashfs/src/mkfs.c b/bin/gensquashfs/src/mkfs.c index de291fa..87ad6fc 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 = istream_open_file(&sortfile, opt.sortfile); + int ret = sqfs_istream_open_file(&sortfile, opt.sortfile); if (ret) { sqfs_perror(opt.sortfile, NULL, ret); goto out; diff --git a/bin/gensquashfs/src/mkfs.h b/bin/gensquashfs/src/mkfs.h index 5c97750..fd6de7f 100644 --- a/bin/gensquashfs/src/mkfs.h +++ b/bin/gensquashfs/src/mkfs.h @@ -13,7 +13,6 @@ #include "common.h" #include "io/dir_iterator.h" #include "util/util.h" -#include "io/file.h" #ifdef HAVE_SYS_XATTR_H #include <sys/xattr.h> |