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 --- mkfs/mkfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mkfs') diff --git a/mkfs/mkfs.c b/mkfs/mkfs.c index 5e350c8..357dad7 100644 --- a/mkfs/mkfs.c +++ b/mkfs/mkfs.c @@ -96,7 +96,7 @@ static int pack_files(sqfs_block_processor_t *data, fstree_t *fs, SZ_ADD_OV(sizeof(*inode), size, &size)) { fputs("creating file inode: too many blocks\n", stderr); - file->destroy(file); + sqfs_destroy(file); free(node_path); return -1; } @@ -104,7 +104,7 @@ static int pack_files(sqfs_block_processor_t *data, fstree_t *fs, inode = calloc(1, size); if (inode == NULL) { perror("creating file inode"); - file->destroy(file); + sqfs_destroy(file); free(node_path); return -1; } @@ -121,7 +121,7 @@ static int pack_files(sqfs_block_processor_t *data, fstree_t *fs, flags |= SQFS_BLK_DONT_FRAGMENT; ret = write_data_from_file(path, data, inode, file, flags); - file->destroy(file); + sqfs_destroy(file); free(node_path); if (ret) -- cgit v1.2.3