Migrate file istream/ostream from libio to libsquashfs

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

12 files changed, 29 insertions, 25 deletions

diff --git a/lib/tar/test/tar_big_file.c b/lib/tar/test/tar_big_file.c
index 6a88d4c..2c8a176 100644
--- a/lib/tar/test/tar_big_file.c
+++ b/lib/tar/test/tar_big_file.c
@@ -6,8 +6,8 @@
  */
 #include "config.h"
 #include "tar/tar.h"
-#include "io/file.h"
 #include "util/test.h"
+#include "sqfs/io.h"
 
 int main(int argc, char **argv)
 {
@@ -16,7 +16,8 @@ int main(int argc, char **argv)
 	int ret;
 	(void)argc; (void)argv;
 
-	ret = istream_open_file(&fp, STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	ret = sqfs_istream_open_file(&fp,
+				     STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
 	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_ASSERT(read_header(fp, &hdr) == 0);
diff --git a/lib/tar/test/tar_fuzz.c b/lib/tar/test/tar_fuzz.c
index 42fe73d..1c4b52e 100644
--- a/lib/tar/test/tar_fuzz.c
+++ b/lib/tar/test/tar_fuzz.c
@@ -6,7 +6,7 @@
  */
 #include "config.h"
 
-#include "io/file.h"
+#include "sqfs/io.h"
 #include "tar/tar.h"
 #include "common.h"
 
@@ -24,7 +24,7 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	ret = istream_open_file(&fp, argv[1]);
+	ret = sqfs_istream_open_file(&fp, argv[1]);
 	if (ret) {
 		sqfs_perror("stdint", NULL, ret);
 		return EXIT_FAILURE;
diff --git a/lib/tar/test/tar_iterator.c b/lib/tar/test/tar_iterator.c
index 8de50ed..d4c2a35 100644
--- a/lib/tar/test/tar_iterator.c
+++ b/lib/tar/test/tar_iterator.c
@@ -5,10 +5,10 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-#include "io/file.h"
 #include "tar/tar.h"
 #include "util/test.h"
 #include "sqfs/error.h"
+#include "sqfs/io.h"
 
 #ifndef TESTUID
 #define TESTUID 1000
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 	(void)argc; (void)argv;
 
 	/* Open the file, create an iterator */
-	iret = istream_open_file(&fp,
+	iret = sqfs_istream_open_file(&fp,
 				 STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
 	TEST_EQUAL_I(iret, 0);
 	TEST_NOT_NULL(fp);
@@ -109,7 +109,7 @@ int main(int argc, char **argv)
 	sqfs_drop(fp);
 
 	/* re-open the tar iterator */
-	iret = istream_open_file(&fp,
+	iret = sqfs_istream_open_file(&fp,
 				 STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
 	TEST_EQUAL_I(iret, 0);
 	TEST_NOT_NULL(fp);
diff --git a/lib/tar/test/tar_iterator2.c b/lib/tar/test/tar_iterator2.c
index 8826762..8bbaf62 100644
--- a/lib/tar/test/tar_iterator2.c
+++ b/lib/tar/test/tar_iterator2.c
@@ -5,9 +5,9 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-#include "io/file.h"
 #include "tar/tar.h"
 #include "util/test.h"
+#include "sqfs/io.h"
 
 static const struct {
 	uint64_t offset;
@@ -52,7 +52,7 @@ int main(int argc, char **argv)
 	int iret;
 	(void)argc; (void)argv;
 
-	iret = istream_open_file(&fp,
+	iret = sqfs_istream_open_file(&fp,
 				 STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
 	TEST_EQUAL_I(iret, 0);
 	TEST_NOT_NULL(fp);
diff --git a/lib/tar/test/tar_iterator3.c b/lib/tar/test/tar_iterator3.c
index 0aee0e3..9fd5f59 100644
--- a/lib/tar/test/tar_iterator3.c
+++ b/lib/tar/test/tar_iterator3.c
@@ -6,10 +6,10 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-#include "io/file.h"
 #include "tar/tar.h"
 #include "util/test.h"
 #include "sqfs/error.h"
+#include "sqfs/io.h"
 
 int main(int argc, char **argv)
 {
@@ -23,7 +23,7 @@ int main(int argc, char **argv)
 
 	TEST_ASSERT(chdir(TEST_PATH) == 0);
 
-	ret = istream_open_file(&fp, "format-acceptance/link_filled.tar");
+	ret = sqfs_istream_open_file(&fp, "format-acceptance/link_filled.tar");
 	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_EQUAL_UI(((sqfs_object_t *)fp)->refcount, 1);
diff --git a/lib/tar/test/tar_simple.c b/lib/tar/test/tar_simple.c
index 8ee5b84..ad9fdde 100644
--- a/lib/tar/test/tar_simple.c
+++ b/lib/tar/test/tar_simple.c
@@ -5,9 +5,9 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-#include "io/file.h"
 #include "tar/tar.h"
 #include "util/test.h"
+#include "sqfs/io.h"
 
 #ifndef TESTUID
 #define TESTUID 1000
@@ -43,7 +43,8 @@ int main(int argc, char **argv)
 	int ret;
 	(void)argc; (void)argv;
 
-	ret = istream_open_file(&fp, STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	ret = sqfs_istream_open_file(&fp,
+				STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
 	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_ASSERT(read_header(fp, &hdr) == 0);
diff --git a/lib/tar/test/tar_sparse.c b/lib/tar/test/tar_sparse.c
index d93482d..49b2064 100644
--- a/lib/tar/test/tar_sparse.c
+++ b/lib/tar/test/tar_sparse.c
@@ -5,9 +5,9 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-#include "io/file.h"
 #include "tar/tar.h"
 #include "util/test.h"
+#include "sqfs/io.h"
 
 static void test_case_sparse(const char *path)
 {
@@ -16,7 +16,7 @@ static void test_case_sparse(const char *path)
 	sqfs_istream_t *fp;
 	int ret;
 
-	ret = istream_open_file(&fp, path);
+	ret = sqfs_istream_open_file(&fp, path);
 	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_ASSERT(read_header(fp, &hdr) == 0);
diff --git a/lib/tar/test/tar_sparse_gnu.c b/lib/tar/test/tar_sparse_gnu.c
index 6effb52..a2f8332 100644
--- a/lib/tar/test/tar_sparse_gnu.c
+++ b/lib/tar/test/tar_sparse_gnu.c
@@ -5,9 +5,9 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-#include "io/file.h"
 #include "tar/tar.h"
 #include "util/test.h"
+#include "sqfs/io.h"
 
 int main(int argc, char **argv)
 {
@@ -19,7 +19,7 @@ int main(int argc, char **argv)
 
 	TEST_ASSERT(chdir(TEST_PATH) == 0);
 
-	ret = istream_open_file(&fp, "sparse-files/gnu-small.tar");
+	ret = sqfs_istream_open_file(&fp, "sparse-files/gnu-small.tar");
 	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_ASSERT(read_header(fp, &hdr) == 0);
diff --git a/lib/tar/test/tar_target_filled.c b/lib/tar/test/tar_target_filled.c
index 85a1af4..93c3b02 100644
--- a/lib/tar/test/tar_target_filled.c
+++ b/lib/tar/test/tar_target_filled.c
@@ -5,9 +5,9 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-#include "io/file.h"
 #include "tar/tar.h"
 #include "util/test.h"
+#include "sqfs/io.h"
 
 int main(int argc, char **argv)
 {
@@ -19,7 +19,7 @@ int main(int argc, char **argv)
 
 	TEST_ASSERT(chdir(TEST_PATH) == 0);
 
-	ret = istream_open_file(&fp, "format-acceptance/link_filled.tar");
+	ret = sqfs_istream_open_file(&fp, "format-acceptance/link_filled.tar");
 	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 
diff --git a/lib/tar/test/tar_write_simple.c b/lib/tar/test/tar_write_simple.c
index 28f199f..bc1b93e 100644
--- a/lib/tar/test/tar_write_simple.c
+++ b/lib/tar/test/tar_write_simple.c
@@ -7,7 +7,6 @@
 #include "config.h"
 #include "tar/tar.h"
 #include "sqfs/io.h"
-#include "io/file.h"
 #include "util/test.h"
 #include "sqfs/xattr.h"
 #include "compat.h"
@@ -188,7 +187,8 @@ int main(int argc, char **argv)
 	TEST_EQUAL_UI(wr_offset, sizeof(wr_buffer));
 	TEST_EQUAL_UI(sizeof(rd_buffer), sizeof(wr_buffer));
 
-	ret = istream_open_file(&fp, STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	ret = sqfs_istream_open_file(&fp,
+				STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
 	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 
diff --git a/lib/tar/test/tar_xattr.c b/lib/tar/test/tar_xattr.c
index 0e0579c..d074e31 100644
--- a/lib/tar/test/tar_xattr.c
+++ b/lib/tar/test/tar_xattr.c
@@ -5,10 +5,10 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-#include "io/file.h"
 #include "tar/tar.h"
 #include "util/test.h"
 #include "sqfs/xattr.h"
+#include "sqfs/io.h"
 
 int main(int argc, char **argv)
 {
@@ -18,7 +18,8 @@ int main(int argc, char **argv)
 	int ret;
 	(void)argc; (void)argv;
 
-	ret = istream_open_file(&fp, STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	ret = sqfs_istream_open_file(&fp,
+				STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
 	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_ASSERT(read_header(fp, &hdr) == 0);
diff --git a/lib/tar/test/tar_xattr_bin.c b/lib/tar/test/tar_xattr_bin.c
index 617c356..68f23fe 100644
--- a/lib/tar/test/tar_xattr_bin.c
+++ b/lib/tar/test/tar_xattr_bin.c
@@ -5,10 +5,10 @@
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
 #include "config.h"
-#include "io/file.h"
 #include "tar/tar.h"
 #include "util/test.h"
 #include "sqfs/xattr.h"
+#include "sqfs/io.h"
 
 static const uint8_t value[] = {
 	0x00, 0x00, 0x00, 0x02,
@@ -26,7 +26,8 @@ int main(int argc, char **argv)
 	int ret;
 	(void)argc; (void)argv;
 
-	ret = istream_open_file(&fp, STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
+	ret = sqfs_istream_open_file(&fp,
+				STRVALUE(TESTPATH) "/" STRVALUE(TESTFILE));
 	TEST_EQUAL_I(ret, 0);
 	TEST_NOT_NULL(fp);
 	TEST_ASSERT(read_header(fp, &hdr) == 0);