From 303680ebcd5adaac2934b63a0edc2d9d1a36d7fb Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Wed, 12 Feb 2020 02:22:31 +0100 Subject: Implement a more explicit object system Make every dynamically allocated, opaque data structure inherit from a common sqfs_object_t structure with common entry points (e.g. destroy). This removes tons of public API functions and replaces them with a simple sqfs_destroy instead. If semantics of the (until now implicit) object system need to be extended, it can be much more conveniantely done this way. Signed-off-by: David Oberhollenzer --- difftool/sqfsdiff.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'difftool') diff --git a/difftool/sqfsdiff.c b/difftool/sqfsdiff.c index 58ddb4b..c5d2bf2 100644 --- a/difftool/sqfsdiff.c +++ b/difftool/sqfsdiff.c @@ -103,28 +103,28 @@ static int open_sfqs(sqfs_state_t *state, const char *path) return 0; fail_data: - sqfs_data_reader_destroy(state->data); + sqfs_destroy(state->data); fail_tree: sqfs_dir_tree_destroy(state->root); fail_dr: - sqfs_dir_reader_destroy(state->dr); + sqfs_destroy(state->dr); fail_id: - sqfs_id_table_destroy(state->idtbl); + sqfs_destroy(state->idtbl); fail_cmp: - state->cmp->destroy(state->cmp); + sqfs_destroy(state->cmp); fail_file: - state->file->destroy(state->file); + sqfs_destroy(state->file); return -1; } static void close_sfqs(sqfs_state_t *state) { - sqfs_data_reader_destroy(state->data); + sqfs_destroy(state->data); sqfs_dir_tree_destroy(state->root); - sqfs_dir_reader_destroy(state->dr); - sqfs_id_table_destroy(state->idtbl); - state->cmp->destroy(state->cmp); - state->file->destroy(state->file); + sqfs_destroy(state->dr); + sqfs_destroy(state->idtbl); + sqfs_destroy(state->cmp); + sqfs_destroy(state->file); } int main(int argc, char **argv) -- cgit v1.2.3