From 63bc750fecb00fc5878ca889204fc65510893778 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Sun, 11 Jun 2023 23:27:16 +0200
Subject: libio: remove single line wrapper functions
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
bin/gensquashfs/src/fstree_from_file.c | 2 +-
bin/gensquashfs/src/sort_by_file.c | 2 +-
bin/rdsquashfs/src/fill_files.c | 2 +-
bin/sqfs2tar/src/sqfs2tar.c | 4 ++--
bin/sqfsdiff/src/extract.c | 2 +-
bin/tar2sqfs/src/process_tarball.c | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'bin')
diff --git a/bin/gensquashfs/src/fstree_from_file.c b/bin/gensquashfs/src/fstree_from_file.c
index dc7181f..325bce2 100644
--- a/bin/gensquashfs/src/fstree_from_file.c
+++ b/bin/gensquashfs/src/fstree_from_file.c
@@ -280,7 +280,7 @@ int fstree_from_file_stream(fstree_t *fs, istream_t *fp, const char *basepath)
char *line;
int ret;
- filename = istream_get_filename(fp);
+ filename = fp->get_filename(fp);
for (;;) {
ret = istream_get_line(fp, &line, &line_num,
diff --git a/bin/gensquashfs/src/sort_by_file.c b/bin/gensquashfs/src/sort_by_file.c
index 4a1be49..e2b6338 100644
--- a/bin/gensquashfs/src/sort_by_file.c
+++ b/bin/gensquashfs/src/sort_by_file.c
@@ -244,7 +244,7 @@ int fstree_sort_files(fstree_t *fs, istream_t *sortfile)
node->flags &= ~FLAG_FILE_ALREADY_MATCHED;
}
- filename = istream_get_filename(sortfile);
+ filename = sortfile->get_filename(sortfile);
for (;;) {
bool do_glob, path_glob, have_match;
diff --git a/bin/rdsquashfs/src/fill_files.c b/bin/rdsquashfs/src/fill_files.c
index 08e11f5..afc790e 100644
--- a/bin/rdsquashfs/src/fill_files.c
+++ b/bin/rdsquashfs/src/fill_files.c
@@ -155,7 +155,7 @@ static int fill_files(sqfs_data_reader_t *data, int flags)
ret = sqfs_data_reader_dump(files[i].path, data, files[i].inode,
fp, block_size);
if (ret == 0)
- ret = ostream_flush(fp);
+ ret = fp->flush(fp);
sqfs_drop(fp);
if (ret)
diff --git a/bin/sqfs2tar/src/sqfs2tar.c b/bin/sqfs2tar/src/sqfs2tar.c
index 43f9e78..fd8d5fa 100644
--- a/bin/sqfs2tar/src/sqfs2tar.c
+++ b/bin/sqfs2tar/src/sqfs2tar.c
@@ -63,7 +63,7 @@ static int terminate_archive(void)
memset(buffer, '\0', sizeof(buffer));
- return ostream_append(out_file, buffer, sizeof(buffer));
+ return out_file->append(out_file, buffer, sizeof(buffer));
}
static sqfs_tree_node_t *tree_merge(sqfs_tree_node_t *lhs,
@@ -253,7 +253,7 @@ int main(int argc, char **argv)
if (terminate_archive())
goto out;
- if (ostream_flush(out_file))
+ if (out_file->flush(out_file))
goto out;
status = EXIT_SUCCESS;
diff --git a/bin/sqfsdiff/src/extract.c b/bin/sqfsdiff/src/extract.c
index f2072d4..7e745cf 100644
--- a/bin/sqfsdiff/src/extract.c
+++ b/bin/sqfsdiff/src/extract.c
@@ -33,7 +33,7 @@ static int extract(sqfs_data_reader_t *data, const sqfs_inode_generic_t *inode,
return -1;
}
- ostream_flush(fp);
+ fp->flush(fp);
sqfs_drop(fp);
return 0;
}
diff --git a/bin/tar2sqfs/src/process_tarball.c b/bin/tar2sqfs/src/process_tarball.c
index 91572ec..69d430d 100644
--- a/bin/tar2sqfs/src/process_tarball.c
+++ b/bin/tar2sqfs/src/process_tarball.c
@@ -31,7 +31,7 @@ static int write_file(sqfs_writer_t *sqfs, dir_iterator_t *it,
ret = istream_splice(in, out, cfg.block_size);
} while (ret > 0);
- ostream_flush(out);
+ out->flush(out);
sqfs_drop(out);
sqfs_drop(in);
return ret;
--
cgit v1.2.3