summaryrefslogtreecommitdiff
path: root/difftool/sqfsdiff.c
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-02-12 02:22:31 +0100
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-02-12 02:26:24 +0100
commit303680ebcd5adaac2934b63a0edc2d9d1a36d7fb (patch)
treebd2012dc6fa56f7259dbe2e5edd7ab3042f8e0a0 /difftool/sqfsdiff.c
parentec7a522a520017327dd73b4d8e3787016ee1a31e (diff)
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 <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'difftool/sqfsdiff.c')
-rw-r--r--difftool/sqfsdiff.c20
1 files changed, 10 insertions, 10 deletions
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)