Cleanup: split the block processor common.c again

This commit breaks the common code up again by moving the data submission
code to a separate file, making both a little bit more readable.

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

3 files changed, 165 insertions, 156 deletions

diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am
index fffa502..61c9b09 100644
--- a/lib/sqfs/Makemodule.am
+++ b/lib/sqfs/Makemodule.am
@@ -23,6 +23,7 @@ libsquashfs_la_SOURCES += lib/sqfs/inode.c
 libsquashfs_la_SOURCES += lib/sqfs/write_super.c lib/sqfs/data_reader.c
 libsquashfs_la_SOURCES += lib/sqfs/block_processor/internal.h
 libsquashfs_la_SOURCES += lib/sqfs/block_processor/common.c
+libsquashfs_la_SOURCES += lib/sqfs/block_processor/frontend.c
 libsquashfs_la_SOURCES += lib/sqfs/frag_table.c include/sqfs/frag_table.h
 libsquashfs_la_SOURCES += lib/sqfs/block_writer.c include/sqfs/block_writer.h
 libsquashfs_la_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/lib/sqfs/block_processor/common.c b/lib/sqfs/block_processor/common.c
index 1bccf57..01f4cce 100644
--- a/lib/sqfs/block_processor/common.c
+++ b/lib/sqfs/block_processor/common.c
@@ -44,23 +44,6 @@ static int set_block_size(sqfs_inode_generic_t **inode,
 	return 0;
 }
 
-static sqfs_block_t *get_new_block(sqfs_block_processor_t *proc)
-{
-	sqfs_block_t *blk;
-
-	if (proc->free_list != NULL) {
-		blk = proc->free_list;
-		proc->free_list = blk->next;
-	} else {
-		blk = malloc(sizeof(*blk) + proc->max_block_size);
-	}
-
-	if (blk != NULL)
-		memset(blk, 0, sizeof(*blk));
-
-	return blk;
-}
-
 static void release_old_block(sqfs_block_processor_t *proc, sqfs_block_t *blk)
 {
 	sqfs_block_t *it;
@@ -259,142 +242,3 @@ fail_outblk:
 	}
 	return err;
 }
-
-static int add_sentinel_block(sqfs_block_processor_t *proc)
-{
-	sqfs_block_t *blk = get_new_block(proc);
-
-	if (blk == NULL)
-		return SQFS_ERROR_ALLOC;
-
-	blk->inode = proc->inode;
-	blk->flags = proc->blk_flags | SQFS_BLK_LAST_BLOCK;
-
-	return append_to_work_queue(proc, blk);
-}
-
-static int flush_block(sqfs_block_processor_t *proc)
-{
-	sqfs_block_t *block = proc->blk_current;
-
-	proc->blk_current = NULL;
-
-	if (block->size < proc->max_block_size &&
-	    !(block->flags & SQFS_BLK_DONT_FRAGMENT)) {
-		block->flags |= SQFS_BLK_IS_FRAGMENT;
-	} else {
-		proc->blk_flags &= ~SQFS_BLK_FIRST_BLOCK;
-	}
-
-	block->index = proc->blk_index++;
-	return append_to_work_queue(proc, block);
-}
-
-int sqfs_block_processor_begin_file(sqfs_block_processor_t *proc,
-				    sqfs_inode_generic_t **inode, sqfs_u32 flags)
-{
-	if (proc->inode != NULL)
-		return SQFS_ERROR_SEQUENCE;
-
-	if (flags & ~SQFS_BLK_USER_SETTABLE_FLAGS)
-		return SQFS_ERROR_UNSUPPORTED;
-
-	(*inode) = calloc(1, sizeof(sqfs_inode_generic_t));
-	if ((*inode) == NULL)
-		return SQFS_ERROR_ALLOC;
-
-	(*inode)->base.type = SQFS_INODE_FILE;
-	sqfs_inode_set_frag_location(*inode, 0xFFFFFFFF, 0xFFFFFFFF);
-
-	proc->inode = inode;
-	proc->blk_flags = flags | SQFS_BLK_FIRST_BLOCK;
-	proc->blk_index = 0;
-	return 0;
-}
-
-int sqfs_block_processor_append(sqfs_block_processor_t *proc, const void *data,
-				size_t size)
-{
-	sqfs_block_t *new;
-	sqfs_u64 filesize;
-	size_t diff;
-	int err;
-
-	sqfs_inode_get_file_size(*(proc->inode), &filesize);
-	sqfs_inode_set_file_size(*(proc->inode), filesize + size);
-
-	while (size > 0) {
-		if (proc->blk_current == NULL) {
-			new = get_new_block(proc);
-			if (new == NULL)
-				return SQFS_ERROR_ALLOC;
-
-			proc->blk_current = new;
-			proc->blk_current->flags = proc->blk_flags;
-			proc->blk_current->inode = proc->inode;
-		}
-
-		diff = proc->max_block_size - proc->blk_current->size;
-
-		if (diff == 0) {
-			err = flush_block(proc);
-			if (err)
-				return err;
-			continue;
-		}
-
-		if (diff > size)
-			diff = size;
-
-		memcpy(proc->blk_current->data + proc->blk_current->size,
-		       data, diff);
-
-		size -= diff;
-		proc->blk_current->size += diff;
-		data = (const char *)data + diff;
-
-		proc->stats.input_bytes_read += diff;
-	}
-
-	if (proc->blk_current != NULL &&
-	    proc->blk_current->size == proc->max_block_size) {
-		return flush_block(proc);
-	}
-
-	return 0;
-}
-
-int sqfs_block_processor_end_file(sqfs_block_processor_t *proc)
-{
-	int err;
-
-	if (proc->inode == NULL)
-		return SQFS_ERROR_SEQUENCE;
-
-	if (!(proc->blk_flags & SQFS_BLK_FIRST_BLOCK)) {
-		if (proc->blk_current != NULL &&
-		    (proc->blk_flags & SQFS_BLK_DONT_FRAGMENT)) {
-			proc->blk_current->flags |= SQFS_BLK_LAST_BLOCK;
-		} else {
-			err = add_sentinel_block(proc);
-			if (err)
-				return err;
-		}
-	}
-
-	if (proc->blk_current != NULL) {
-		err = flush_block(proc);
-		if (err)
-			return err;
-	}
-
-	proc->inode = NULL;
-	proc->blk_flags = 0;
-	return 0;
-}
-
-const sqfs_block_processor_stats_t
-*sqfs_block_processor_get_stats(const sqfs_block_processor_t *proc)
-{
-	return &proc->stats;
-}
diff --git a/lib/sqfs/block_processor/frontend.c b/lib/sqfs/block_processor/frontend.c
new file mode 100644
index 0000000..cfa6581
--- /dev/null
+++ b/lib/sqfs/block_processor/frontend.c
@@ -0,0 +1,164 @@
+/* SPDX-License-Identifier: LGPL-3.0-or-later */
+/*
+ * frontend.c
+ *
+ * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
+ */
+#define SQFS_BUILDING_DLL
+#include "internal.h"
+
+static sqfs_block_t *get_new_block(sqfs_block_processor_t *proc)
+{
+	sqfs_block_t *blk;
+
+	if (proc->free_list != NULL) {
+		blk = proc->free_list;
+		proc->free_list = blk->next;
+	} else {
+		blk = malloc(sizeof(*blk) + proc->max_block_size);
+	}
+
+	if (blk != NULL)
+		memset(blk, 0, sizeof(*blk));
+
+	return blk;
+}
+
+static int add_sentinel_block(sqfs_block_processor_t *proc)
+{
+	sqfs_block_t *blk = get_new_block(proc);
+
+	if (blk == NULL)
+		return SQFS_ERROR_ALLOC;
+
+	blk->inode = proc->inode;
+	blk->flags = proc->blk_flags | SQFS_BLK_LAST_BLOCK;
+
+	return append_to_work_queue(proc, blk);
+}
+
+static int flush_block(sqfs_block_processor_t *proc)
+{
+	sqfs_block_t *block = proc->blk_current;
+
+	proc->blk_current = NULL;
+
+	if (block->size < proc->max_block_size &&
+	    !(block->flags & SQFS_BLK_DONT_FRAGMENT)) {
+		block->flags |= SQFS_BLK_IS_FRAGMENT;
+	} else {
+		proc->blk_flags &= ~SQFS_BLK_FIRST_BLOCK;
+	}
+
+	block->index = proc->blk_index++;
+	return append_to_work_queue(proc, block);
+}
+
+int sqfs_block_processor_begin_file(sqfs_block_processor_t *proc,
+				    sqfs_inode_generic_t **inode, sqfs_u32 flags)
+{
+	if (proc->inode != NULL)
+		return SQFS_ERROR_SEQUENCE;
+
+	if (flags & ~SQFS_BLK_USER_SETTABLE_FLAGS)
+		return SQFS_ERROR_UNSUPPORTED;
+
+	(*inode) = calloc(1, sizeof(sqfs_inode_generic_t));
+	if ((*inode) == NULL)
+		return SQFS_ERROR_ALLOC;
+
+	(*inode)->base.type = SQFS_INODE_FILE;
+	sqfs_inode_set_frag_location(*inode, 0xFFFFFFFF, 0xFFFFFFFF);
+
+	proc->inode = inode;
+	proc->blk_flags = flags | SQFS_BLK_FIRST_BLOCK;
+	proc->blk_index = 0;
+	return 0;
+}
+
+int sqfs_block_processor_append(sqfs_block_processor_t *proc, const void *data,
+				size_t size)
+{
+	sqfs_block_t *new;
+	sqfs_u64 filesize;
+	size_t diff;
+	int err;
+
+	sqfs_inode_get_file_size(*(proc->inode), &filesize);
+	sqfs_inode_set_file_size(*(proc->inode), filesize + size);
+
+	while (size > 0) {
+		if (proc->blk_current == NULL) {
+			new = get_new_block(proc);
+			if (new == NULL)
+				return SQFS_ERROR_ALLOC;
+
+			proc->blk_current = new;
+			proc->blk_current->flags = proc->blk_flags;
+			proc->blk_current->inode = proc->inode;
+		}
+
+		diff = proc->max_block_size - proc->blk_current->size;
+
+		if (diff == 0) {
+			err = flush_block(proc);
+			if (err)
+				return err;
+			continue;
+		}
+
+		if (diff > size)
+			diff = size;
+
+		memcpy(proc->blk_current->data + proc->blk_current->size,
+		       data, diff);
+
+		size -= diff;
+		proc->blk_current->size += diff;
+		data = (const char *)data + diff;
+
+		proc->stats.input_bytes_read += diff;
+	}
+
+	if (proc->blk_current != NULL &&
+	    proc->blk_current->size == proc->max_block_size) {
+		return flush_block(proc);
+	}
+
+	return 0;
+}
+
+int sqfs_block_processor_end_file(sqfs_block_processor_t *proc)
+{
+	int err;
+
+	if (proc->inode == NULL)
+		return SQFS_ERROR_SEQUENCE;
+
+	if (!(proc->blk_flags & SQFS_BLK_FIRST_BLOCK)) {
+		if (proc->blk_current != NULL &&
+		    (proc->blk_flags & SQFS_BLK_DONT_FRAGMENT)) {
+			proc->blk_current->flags |= SQFS_BLK_LAST_BLOCK;
+		} else {
+			err = add_sentinel_block(proc);
+			if (err)
+				return err;
+		}
+	}
+
+	if (proc->blk_current != NULL) {
+		err = flush_block(proc);
+		if (err)
+			return err;
+	}
+
+	proc->inode = NULL;
+	proc->blk_flags = 0;
+	return 0;
+}
+
+const sqfs_block_processor_stats_t
+*sqfs_block_processor_get_stats(const sqfs_block_processor_t *proc)
+{
+	return &proc->stats;
+}