diff options
author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-09-25 17:20:45 +0200 |
---|---|---|
committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-09-25 17:21:01 +0200 |
commit | 4d79f55f4a626a3cfd8bd18673aa29b48b16e137 (patch) | |
tree | 17c6bc1b1588e3d3e22c4cae793ddacb3c41fd9d /lib | |
parent | de4fc4b7e7b4302388cc1f778025f0843ef4ab24 (diff) |
Cleanup: move the stdin sqfs_file_t wrapper out of libsquashfs
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/sqfs/Makemodule.am | 2 | ||||
-rw-r--r-- | lib/sqfshelper/Makemodule.am | 2 | ||||
-rw-r--r-- | lib/sqfshelper/io_stdin.c (renamed from lib/sqfs/io_stdin.c) | 5 |
3 files changed, 4 insertions, 5 deletions
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> |