From 359d71e90050a8b83f7bc7d2ecd4ff29c477cc22 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Sun, 26 Jun 2022 22:51:27 +0200
Subject: Cleanup: rename libfstream to libio, split headers

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
 bin/tar2sqfs/Makemodule.am | 2 +-
 bin/tar2sqfs/options.c     | 8 ++++----
 bin/tar2sqfs/tar2sqfs.c    | 4 ++--
 bin/tar2sqfs/tar2sqfs.h    | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'bin/tar2sqfs')

diff --git a/bin/tar2sqfs/Makemodule.am b/bin/tar2sqfs/Makemodule.am
index 6db3628..818f6e2 100644
--- a/bin/tar2sqfs/Makemodule.am
+++ b/bin/tar2sqfs/Makemodule.am
@@ -1,7 +1,7 @@
 tar2sqfs_SOURCES = bin/tar2sqfs/tar2sqfs.c bin/tar2sqfs/tar2sqfs.h
 tar2sqfs_SOURCES += bin/tar2sqfs/options.c bin/tar2sqfs/process_tarball.c
 tar2sqfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-tar2sqfs_LDADD = libcommon.a libsquashfs.la libtar.a libfstream.a
+tar2sqfs_LDADD = libcommon.a libsquashfs.la libtar.a libio.a
 tar2sqfs_LDADD += libfstree.a libcompat.a libfstree.a $(LZO_LIBS)
 tar2sqfs_LDADD += $(ZLIB_LIBS) $(XZ_LIBS) $(ZSTD_LIBS) $(BZIP2_LIBS)
 tar2sqfs_LDADD += $(PTHREAD_LIBS)
diff --git a/bin/tar2sqfs/options.c b/bin/tar2sqfs/options.c
index 7727a47..94e7036 100644
--- a/bin/tar2sqfs/options.c
+++ b/bin/tar2sqfs/options.c
@@ -94,15 +94,15 @@ char *root_becomes = NULL;
 
 static void input_compressor_print_available(void)
 {
-	int i = FSTREAM_COMPRESSOR_MIN;
+	int i = IO_COMPRESSOR_MIN;
 	const char *name;
 
 	fputs("\nSupported tar compression formats:\n", stdout);
 
-	while (i <= FSTREAM_COMPRESSOR_MAX) {
-		name = fstream_compressor_name_from_id(i);
+	while (i <= IO_COMPRESSOR_MAX) {
+		name = io_compressor_name_from_id(i);
 
-		if (fstream_compressor_exists(i))
+		if (io_compressor_exists(i))
 			printf("\t%s\n", name);
 
 		++i;
diff --git a/bin/tar2sqfs/tar2sqfs.c b/bin/tar2sqfs/tar2sqfs.c
index 603ee25..4e9ade9 100644
--- a/bin/tar2sqfs/tar2sqfs.c
+++ b/bin/tar2sqfs/tar2sqfs.c
@@ -50,11 +50,11 @@ int main(int argc, char **argv)
 		goto out_if;
 
 	if (ret > 0) {
-		if (!fstream_compressor_exists(ret)) {
+		if (!io_compressor_exists(ret)) {
 			fprintf(stderr,
 				"%s: %s compression is not supported.\n",
 				istream_get_filename(input_file),
-				fstream_compressor_name_from_id(ret));
+				io_compressor_name_from_id(ret));
 			goto out_if;
 		}
 
diff --git a/bin/tar2sqfs/tar2sqfs.h b/bin/tar2sqfs/tar2sqfs.h
index 915d89c..d5a4ada 100644
--- a/bin/tar2sqfs/tar2sqfs.h
+++ b/bin/tar2sqfs/tar2sqfs.h
@@ -12,6 +12,8 @@
 #include "compat.h"
 #include "tar.h"
 
+#include "io/xfrm.h"
+
 #include <stdlib.h>
 #include <getopt.h>
 #include <string.h>
-- 
cgit v1.2.3