From 359d71e90050a8b83f7bc7d2ecd4ff29c477cc22 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 26 Jun 2022 22:51:27 +0200 Subject: Cleanup: rename libfstream to libio, split headers Signed-off-by: David Oberhollenzer --- bin/gensquashfs/Makemodule.am | 2 +- bin/rdsquashfs/Makemodule.am | 2 +- bin/sqfs2tar/Makemodule.am | 2 +- bin/sqfs2tar/options.c | 12 ++++++------ bin/sqfs2tar/sqfs2tar.h | 2 ++ bin/sqfsdiff/Makemodule.am | 2 +- bin/tar2sqfs/Makemodule.am | 2 +- bin/tar2sqfs/options.c | 8 ++++---- bin/tar2sqfs/tar2sqfs.c | 4 ++-- bin/tar2sqfs/tar2sqfs.h | 2 ++ 10 files changed, 21 insertions(+), 17 deletions(-) (limited to 'bin') diff --git a/bin/gensquashfs/Makemodule.am b/bin/gensquashfs/Makemodule.am index 11a3535..03f4f4c 100644 --- a/bin/gensquashfs/Makemodule.am +++ b/bin/gensquashfs/Makemodule.am @@ -1,7 +1,7 @@ gensquashfs_SOURCES = bin/gensquashfs/mkfs.c bin/gensquashfs/mkfs.h gensquashfs_SOURCES += bin/gensquashfs/options.c bin/gensquashfs/selinux.c gensquashfs_SOURCES += bin/gensquashfs/dirscan_xattr.c -gensquashfs_LDADD = libcommon.a libsquashfs.la libfstree.a libfstream.a +gensquashfs_LDADD = libcommon.a libsquashfs.la libfstree.a libio.a gensquashfs_LDADD += libcompat.a $(LZO_LIBS) $(PTHREAD_LIBS) gensquashfs_CPPFLAGS = $(AM_CPPFLAGS) gensquashfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) diff --git a/bin/rdsquashfs/Makemodule.am b/bin/rdsquashfs/Makemodule.am index 094771c..974e7bc 100644 --- a/bin/rdsquashfs/Makemodule.am +++ b/bin/rdsquashfs/Makemodule.am @@ -4,7 +4,7 @@ rdsquashfs_SOURCES += bin/rdsquashfs/restore_fstree.c bin/rdsquashfs/describe.c rdsquashfs_SOURCES += bin/rdsquashfs/fill_files.c bin/rdsquashfs/dump_xattrs.c rdsquashfs_SOURCES += bin/rdsquashfs/stat.c rdsquashfs_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -rdsquashfs_LDADD = libcommon.a libfstream.a libcompat.a libsquashfs.la +rdsquashfs_LDADD = libcommon.a libio.a libcompat.a libsquashfs.la rdsquashfs_LDADD += libfstree.a $(LZO_LIBS) $(PTHREAD_LIBS) dist_man1_MANS += bin/rdsquashfs/rdsquashfs.1 diff --git a/bin/sqfs2tar/Makemodule.am b/bin/sqfs2tar/Makemodule.am index 5355157..22d523e 100644 --- a/bin/sqfs2tar/Makemodule.am +++ b/bin/sqfs2tar/Makemodule.am @@ -3,7 +3,7 @@ sqfs2tar_SOURCES += bin/sqfs2tar/options.c bin/sqfs2tar/write_tree.c sqfs2tar_SOURCES += bin/sqfs2tar/xattr.c sqfs2tar_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) sqfs2tar_LDADD = libcommon.a libutil.a libsquashfs.la libtar.a -sqfs2tar_LDADD += libfstream.a libcompat.a libfstree.a +sqfs2tar_LDADD += libio.a libcompat.a libfstree.a sqfs2tar_LDADD += $(ZLIB_LIBS) $(XZ_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(BZIP2_LIBS) sqfs2tar_LDADD += $(PTHREAD_LIBS) diff --git a/bin/sqfs2tar/options.c b/bin/sqfs2tar/options.c index 1b652b5..4f783e0 100644 --- a/bin/sqfs2tar/options.c +++ b/bin/sqfs2tar/options.c @@ -91,14 +91,14 @@ void process_args(int argc, char **argv) switch (i) { case 'c': - compressor = fstream_compressor_id_from_name(optarg); + compressor = io_compressor_id_from_name(optarg); if (compressor <= 0) { fprintf(stderr, "unknown compressor '%s'.\n", optarg); goto fail; } - if (!fstream_compressor_exists(compressor)) { + if (!io_compressor_exists(compressor)) { fprintf(stderr, "%s compressor is not supported.\n", optarg); @@ -163,11 +163,11 @@ void process_args(int argc, char **argv) case 'h': fputs(usagestr, stdout); - i = FSTREAM_COMPRESSOR_MIN; + i = IO_COMPRESSOR_MIN; - while (i <= FSTREAM_COMPRESSOR_MAX) { - name = fstream_compressor_name_from_id(i); - if (fstream_compressor_exists(i)) + while (i <= IO_COMPRESSOR_MAX) { + name = io_compressor_name_from_id(i); + if (io_compressor_exists(i)) printf("\t%s\n", name); ++i; } diff --git a/bin/sqfs2tar/sqfs2tar.h b/bin/sqfs2tar/sqfs2tar.h index 1986c56..587e8ad 100644 --- a/bin/sqfs2tar/sqfs2tar.h +++ b/bin/sqfs2tar/sqfs2tar.h @@ -11,6 +11,8 @@ #include "common.h" #include "tar.h" +#include "io/xfrm.h" + #include #include #include diff --git a/bin/sqfsdiff/Makemodule.am b/bin/sqfsdiff/Makemodule.am index 8331f25..bd93a74 100644 --- a/bin/sqfsdiff/Makemodule.am +++ b/bin/sqfsdiff/Makemodule.am @@ -4,7 +4,7 @@ sqfsdiff_SOURCES += bin/sqfsdiff/compare_dir.c bin/sqfsdiff/node_compare.c sqfsdiff_SOURCES += bin/sqfsdiff/compare_files.c bin/sqfsdiff/super.c sqfsdiff_SOURCES += bin/sqfsdiff/extract.c sqfsdiff_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -sqfsdiff_LDADD = libcommon.a libsquashfs.la libfstream.a libcompat.a +sqfsdiff_LDADD = libcommon.a libsquashfs.la libio.a libcompat.a sqfsdiff_LDADD += $(LZO_LIBS) libfstree.a $(PTHREAD_LIBS) dist_man1_MANS += bin/sqfsdiff/sqfsdiff.1 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 #include #include -- cgit v1.2.3