diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-06-26 22:51:27 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-07-08 19:17:35 +0200 |
| commit | 359d71e90050a8b83f7bc7d2ecd4ff29c477cc22 (patch) | |
| tree | df2b7a585b78e6776446d4ca9be62a22db27f0a7 /bin/sqfs2tar | |
| parent | 2087cc237cd0fe1ed29ebf891648bacb46f4833b (diff) | |
Cleanup: rename libfstream to libio, split headers
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'bin/sqfs2tar')
| -rw-r--r-- | bin/sqfs2tar/Makemodule.am | 2 | ||||
| -rw-r--r-- | bin/sqfs2tar/options.c | 12 | ||||
| -rw-r--r-- | bin/sqfs2tar/sqfs2tar.h | 2 |
3 files changed, 9 insertions, 7 deletions
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 <getopt.h> #include <string.h> #include <stdlib.h> |