Cleanup: move the stdin sqfs_file_t wrapper out of libsquashfs

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

5 files changed, 6 insertions, 19 deletions

diff --git a/include/highlevel.h b/include/highlevel.h
index b2bbd82..ed0f4bf 100644
--- a/include/highlevel.h
+++ b/include/highlevel.h
@@ -83,4 +83,6 @@ int sqfs_data_reader_dump(sqfs_data_reader_t *data,
 			  const sqfs_inode_generic_t *inode,
 			  int outfd, size_t block_size, bool allow_sparse);
 
+sqfs_file_t *sqfs_get_stdin_file(uint64_t size);
+
 #endif /* HIGHLEVEL_H */
diff --git a/include/sqfs/io.h b/include/sqfs/io.h
index f1a5ef0..d7a923c 100644
--- a/include/sqfs/io.h
+++ b/include/sqfs/io.h
@@ -157,20 +157,6 @@ extern "C" {
 SQFS_API sqfs_file_t *sqfs_open_file(const char *filename, int flags);
 
 /**
- * @brief Get a read-only file implementation that represents standard input
- *
- * This function creates a read-only file that represents STDIN. The file
- * supports reading up to a specified number of bytes and only allows
- * reading sequentially.
- *
- * @param size The alleged "size" of the file.
- *
- * @return A pointer to a file object on success, NULL on allocation failure.
- */
-SQFS_API sqfs_file_t *sqfs_get_stdin_file(uint64_t size);
-
-
-/**
  * @brief Read a chunk from a file and turn it into a block that can be
  *        fed to a block processor.
  *
diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am
index b07cc5b..36a8cc8 100644
--- a/lib/sqfs/Makemodule.am
+++ b/lib/sqfs/Makemodule.am
@@ -15,7 +15,7 @@ libsquashfs_la_SOURCES += lib/sqfs/read_super.c lib/sqfs/meta_reader.c
 libsquashfs_la_SOURCES += lib/sqfs/read_inode.c lib/sqfs/write_inode.c
 libsquashfs_la_SOURCES += lib/sqfs/dir_writer.c lib/sqfs/xattr_reader.c
 libsquashfs_la_SOURCES += lib/sqfs/read_table.c lib/sqfs/comp/compressor.c
-libsquashfs_la_SOURCES += lib/sqfs/io_stdin.c lib/sqfs/comp/internal.h
+libsquashfs_la_SOURCES += lib/sqfs/comp/internal.h
 libsquashfs_la_SOURCES += lib/sqfs/dir_reader.c lib/sqfs/read_tree.c
 libsquashfs_la_SOURCES += lib/sqfs/inode.c lib/sqfs/data_writer/fragment.c
 libsquashfs_la_SOURCES += lib/sqfs/data_writer/block.c lib/sqfs/io.c
diff --git a/lib/sqfshelper/Makemodule.am b/lib/sqfshelper/Makemodule.am
index b85e6a5..8a8deaa 100644
--- a/lib/sqfshelper/Makemodule.am
+++ b/lib/sqfshelper/Makemodule.am
@@ -8,6 +8,6 @@ libsqfshelper_a_SOURCES += lib/sqfshelper/data_reader_dump.c
 libsqfshelper_a_SOURCES += lib/sqfshelper/compress.c lib/sqfshelper/comp_opt.c
 libsqfshelper_a_SOURCES += include/data_writer.h lib/sqfshelper/data_writer.c
 libsqfshelper_a_SOURCES += lib/sqfshelper/write_xattr.c include/highlevel.h
-libsqfshelper_a_SOURCES += lib/sqfshelper/get_path.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/get_path.c lib/sqfshelper/io_stdin.c
 
 noinst_LIBRARIES += libsqfshelper.a
diff --git a/lib/sqfs/io_stdin.c b/lib/sqfshelper/io_stdin.c
index a65fa0f..6cb45d4 100644
--- a/lib/sqfs/io_stdin.c
+++ b/lib/sqfshelper/io_stdin.c
@@ -1,13 +1,12 @@
-/* SPDX-License-Identifier: LGPL-3.0-or-later */
+/* SPDX-License-Identifier: GPL-3.0-or-later */
 /*
  * io_stdin.c
  *
  * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
  */
-#define SQFS_BUILDING_DLL
 #include "config.h"
 
-#include "sqfs/io.h"
+#include "highlevel.h"
 #include "sqfs/error.h"
 
 #include <stdlib.h>