summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-12 14:04:06 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-09-12 14:05:36 +0200
commit31ae9e5cc5337558ddb456c379949e23af43fd9f (patch)
tree9281c7a14449efd6300fa012310a5151657ea4a5
parent9879cd8393b0d5ec26885de9f9dce2d34997db42 (diff)
Cleanup: move block processor code to sub directory
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r--lib/sqfs/Makemodule.am7
-rw-r--r--lib/sqfs/blk_proc/process_block.c (renamed from lib/sqfs/process_block.c)0
-rw-r--r--lib/sqfs/blk_proc/pthread.c (renamed from lib/sqfs/block_processor_parallel.c)0
-rw-r--r--lib/sqfs/blk_proc/serial.c (renamed from lib/sqfs/block_processor.c)0
4 files changed, 4 insertions, 3 deletions
diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am
index 5a07806..4b8d964 100644
--- a/lib/sqfs/Makemodule.am
+++ b/lib/sqfs/Makemodule.am
@@ -13,7 +13,8 @@ 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/process_block.c lib/sqfs/comp/internal.h
+libsquashfs_la_SOURCES += lib/sqfs/comp/internal.h
+libsquashfs_la_SOURCES += lib/sqfs/blk_proc/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)
@@ -22,9 +23,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/block_processor_parallel.c
+libsquashfs_la_SOURCES += lib/sqfs/blk_proc/pthread.c
else
-libsquashfs_la_SOURCES += lib/sqfs/block_processor.c
+libsquashfs_la_SOURCES += lib/sqfs/blk_proc/serial.c
endif
if WITH_GZIP
diff --git a/lib/sqfs/process_block.c b/lib/sqfs/blk_proc/process_block.c
index 3289767..3289767 100644
--- a/lib/sqfs/process_block.c
+++ b/lib/sqfs/blk_proc/process_block.c
diff --git a/lib/sqfs/block_processor_parallel.c b/lib/sqfs/blk_proc/pthread.c
index a00bf12..a00bf12 100644
--- a/lib/sqfs/block_processor_parallel.c
+++ b/lib/sqfs/blk_proc/pthread.c
diff --git a/lib/sqfs/block_processor.c b/lib/sqfs/blk_proc/serial.c
index ef71f9e..ef71f9e 100644
--- a/lib/sqfs/block_processor.c
+++ b/lib/sqfs/blk_proc/serial.c