From 52c9b6954bad7b3693bf23eeb8a4eb9293c190db Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 10 Feb 2020 21:53:11 +0100 Subject: Cleanup: remove block hooks entirely from block processor Signed-off-by: David Oberhollenzer --- include/sqfs/block_processor.h | 16 ---------------- lib/sqfs/block_processor/common.c | 9 --------- lib/sqfs/block_processor/internal.h | 3 --- 3 files changed, 28 deletions(-) diff --git a/include/sqfs/block_processor.h b/include/sqfs/block_processor.h index fb62678..41cb3d3 100644 --- a/include/sqfs/block_processor.h +++ b/include/sqfs/block_processor.h @@ -218,22 +218,6 @@ SQFS_API int sqfs_block_processor_end_file(sqfs_block_processor_t *proc); */ SQFS_API int sqfs_block_processor_finish(sqfs_block_processor_t *proc); -/** - * @brief Register a set of hooks to be invoked when writing blocks to disk. - * - * @memberof sqfs_block_processor_t - * - * @param proc A pointer to a data writer object. - * @param user_ptr A user pointer to pass to the callbacks. - * @param hooks A structure containing the hooks. - * - * @return Zero on success, @ref SQFS_ERROR_UNSUPPORTED if the size field of - * the hooks doesn't match any size knwon to the library. - */ -SQFS_API -int sqfs_block_processor_set_hooks(sqfs_block_processor_t *proc, void *user_ptr, - const sqfs_block_hooks_t *hooks); - /** * @brief Get accumulated runtime statistics from a block processor * diff --git a/lib/sqfs/block_processor/common.c b/lib/sqfs/block_processor/common.c index 6bd5d26..38941ab 100644 --- a/lib/sqfs/block_processor/common.c +++ b/lib/sqfs/block_processor/common.c @@ -44,15 +44,6 @@ void block_processor_cleanup(sqfs_block_processor_t *proc) free(proc); } -int sqfs_block_processor_set_hooks(sqfs_block_processor_t *proc, void *user_ptr, - const sqfs_block_hooks_t *hooks) -{ - proc->hooks = hooks; - proc->user_ptr = user_ptr; - - return sqfs_block_writer_set_hooks(proc->wr, user_ptr, hooks); -} - int process_completed_block(sqfs_block_processor_t *proc, sqfs_block_t *blk) { sqfs_u64 location; diff --git a/lib/sqfs/block_processor/internal.h b/lib/sqfs/block_processor/internal.h index dcf8a09..847b2c6 100644 --- a/lib/sqfs/block_processor/internal.h +++ b/lib/sqfs/block_processor/internal.h @@ -68,9 +68,6 @@ struct sqfs_block_processor_t { bool notify_threads; sqfs_block_writer_t *wr; - const sqfs_block_hooks_t *hooks; - void *user_ptr; - sqfs_block_processor_stats_t stats; /* file API */ -- cgit v1.2.3