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 --- unpack/rdsquashfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'unpack') diff --git a/unpack/rdsquashfs.c b/unpack/rdsquashfs.c index 14a88ae..99e51fb 100644 --- a/unpack/rdsquashfs.c +++ b/unpack/rdsquashfs.c @@ -179,18 +179,18 @@ int main(int argc, char **argv) out: sqfs_dir_tree_destroy(n); out_data: - sqfs_data_reader_destroy(data); + sqfs_destroy(data); out_dr: - sqfs_dir_reader_destroy(dirrd); + sqfs_destroy(dirrd); out_id: - sqfs_id_table_destroy(idtbl); + sqfs_destroy(idtbl); out_xr: if (xattr != NULL) - sqfs_xattr_reader_destroy(xattr); + sqfs_destroy(xattr); out_cmp: - cmp->destroy(cmp); + sqfs_destroy(cmp); out_file: - file->destroy(file); + sqfs_destroy(file); out_cmd: free(opt.cmdpath); return status; -- cgit v1.2.3