From c56c830ae96ed000c999fb93c23bbaad0303acf9 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Tue, 24 Sep 2019 02:56:42 +0200 Subject: Cleanup pthread based block processing code Break convoluted, long functions up into smaller ones where the control flow (especially locking and signalling) is more easily readable and remove some copy and paste clean up code. Signed-off-by: David Oberhollenzer --- lib/sqfs/blk_proc/serial.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'lib/sqfs/blk_proc/serial.c') diff --git a/lib/sqfs/blk_proc/serial.c b/lib/sqfs/blk_proc/serial.c index 850c33d..06c811e 100644 --- a/lib/sqfs/blk_proc/serial.c +++ b/lib/sqfs/blk_proc/serial.c @@ -59,16 +59,12 @@ int sqfs_block_processor_enqueue(sqfs_block_processor_t *proc, return proc->status; } - if (block->size == 0) { - block->checksum = 0; - } else { - proc->status = sqfs_block_process(block, proc->cmp, - proc->scratch, - proc->max_block_size); - } + proc->status = sqfs_block_process(block, proc->cmp, proc->scratch, + proc->max_block_size); + + if (proc->status == 0) + proc->status = process_completed_block(proc, block); - block->next = NULL; - proc->status = process_completed_block(proc, block); free(block); return proc->status; } -- cgit v1.2.3