diff options
Diffstat (limited to 'bin')
| -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 | ||||
| -rw-r--r-- | bin/rdsquashfs/src/fill_files.c | 2 | ||||
| -rw-r--r-- | bin/sqfsdiff/src/extract.c | 2 |
6 files changed, 5 insertions, 6 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> diff --git a/bin/rdsquashfs/src/fill_files.c b/bin/rdsquashfs/src/fill_files.c index f0ad7e2..7087883 100644 --- a/bin/rdsquashfs/src/fill_files.c +++ b/bin/rdsquashfs/src/fill_files.c @@ -145,7 +145,7 @@ static int fill_files(sqfs_data_reader_t *data, int flags) openflags |= SQFS_FILE_OPEN_NO_SPARSE; for (i = 0; i < num_files; ++i) { - ret = ostream_open_file(&fp, files[i].path, openflags); + ret = sqfs_ostream_open_file(&fp, files[i].path, openflags); if (ret) { sqfs_perror(files[i].path, NULL, ret); return -1; diff --git a/bin/sqfsdiff/src/extract.c b/bin/sqfsdiff/src/extract.c index d51096f..cbc4381 100644 --- a/bin/sqfsdiff/src/extract.c +++ b/bin/sqfsdiff/src/extract.c @@ -22,7 +22,7 @@ static int extract(sqfs_data_reader_t *data, const sqfs_inode_generic_t *inode, return -1; *ptr = '/'; - ret = ostream_open_file(&fp, temp, SQFS_FILE_OPEN_OVERWRITE); + ret = sqfs_ostream_open_file(&fp, temp, SQFS_FILE_OPEN_OVERWRITE); if (ret) { sqfs_perror(temp, NULL, ret); return -1; |