aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-05 15:44:56 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-05 15:44:56 +0200
commit6391ed9a18caf89ade24c05083569c66d8daa33b (patch)
tree1e61bee9545d584f79f9040573275ab876febf8d /lib
parent1245c4eeb1eea7a5301f500d001b6db91c3f1283 (diff)
Move block processor from compressor to libsquashfs code
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib')
-rw-r--r--lib/Makemodule.am6
-rw-r--r--lib/sqfs/block_processor.c (renamed from lib/sqfs/comp/block_processor.c)0
-rw-r--r--lib/sqfs/block_processor_parallel.c (renamed from lib/sqfs/comp/block_processor_parallel.c)0
-rw-r--r--lib/sqfs/process_block.c (renamed from lib/sqfs/comp/process_block.c)0
4 files changed, 3 insertions, 3 deletions
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 6938fd7..bdb23a8 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -57,7 +57,7 @@ libsquashfs_la_SOURCES += lib/sqfs/readdir.c
libsquashfs_la_SOURCES += lib/sqfs/xattr.c lib/sqfs/xattr_reader.c
libsquashfs_la_SOURCES += lib/sqfs/read_table.c
libsquashfs_la_SOURCES += lib/sqfs/comp/compressor.c lib/sqfs/comp/internal.h
-libsquashfs_la_SOURCES += lib/sqfs/comp/process_block.c
+libsquashfs_la_SOURCES += lib/sqfs/process_block.c
libsquashfs_la_CPPFLAGS = $(AM_CPPFLAGS)
libsquashfs_la_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
libsquashfs_la_CFLAGS += $(XZ_CFLAGS) $(LZO_CFLAGS) $(LZ4_CFLAGS)
@@ -66,9 +66,9 @@ libsquashfs_la_LIBADD = $(XZ_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(LZ4_LIBS)
libsquashfs_la_LIBADD += $(ZSTD_LIBS) $(PTHREAD_LIBS) libutil.la
if HAVE_PTHREAD
-libsquashfs_la_SOURCES += lib/sqfs/comp/block_processor_parallel.c
+libsquashfs_la_SOURCES += lib/sqfs/block_processor_parallel.c
else
-libsquashfs_la_SOURCES += lib/sqfs/comp/block_processor.c
+libsquashfs_la_SOURCES += lib/sqfs/block_processor.c
endif
if WITH_GZIP
diff --git a/lib/sqfs/comp/block_processor.c b/lib/sqfs/block_processor.c
index 3a6926c..3a6926c 100644
--- a/lib/sqfs/comp/block_processor.c
+++ b/lib/sqfs/block_processor.c
diff --git a/lib/sqfs/comp/block_processor_parallel.c b/lib/sqfs/block_processor_parallel.c
index a4e0f6e..a4e0f6e 100644
--- a/lib/sqfs/comp/block_processor_parallel.c
+++ b/lib/sqfs/block_processor_parallel.c
diff --git a/lib/sqfs/comp/process_block.c b/lib/sqfs/process_block.c
index a20b56b..a20b56b 100644
--- a/lib/sqfs/comp/process_block.c
+++ b/lib/sqfs/process_block.c