summaryrefslogtreecommitdiff
path: root/lib/sqfs/dir_reader.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 /lib/sqfs/dir_reader.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 'lib/sqfs/dir_reader.c')
-rw-r--r--lib/sqfs/dir_reader.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/lib/sqfs/dir_reader.c b/lib/sqfs/dir_reader.c
index 8eae5bd..39e3e57 100644
--- a/lib/sqfs/dir_reader.c
+++ b/lib/sqfs/dir_reader.c
@@ -20,6 +20,8 @@
#include <stdlib.h>
struct sqfs_dir_reader_t {
+ sqfs_object_t base;
+
sqfs_meta_reader_t *meta_dir;
sqfs_meta_reader_t *meta_inode;
const sqfs_super_t *super;
@@ -34,6 +36,15 @@ struct sqfs_dir_reader_t {
sqfs_u16 inode_offset;
};
+static void dir_reader_destroy(sqfs_object_t *obj)
+{
+ sqfs_dir_reader_t *rd = (sqfs_dir_reader_t *)obj;
+
+ sqfs_destroy(rd->meta_inode);
+ sqfs_destroy(rd->meta_dir);
+ free(rd);
+}
+
sqfs_dir_reader_t *sqfs_dir_reader_create(const sqfs_super_t *super,
sqfs_compressor_t *cmp,
sqfs_file_t *file)
@@ -66,22 +77,16 @@ sqfs_dir_reader_t *sqfs_dir_reader_create(const sqfs_super_t *super,
rd->meta_dir = sqfs_meta_reader_create(file, cmp, start, limit);
if (rd->meta_dir == NULL) {
- sqfs_meta_reader_destroy(rd->meta_inode);
+ sqfs_destroy(rd->meta_inode);
free(rd);
return NULL;
}
+ ((sqfs_object_t *)rd)->destroy = dir_reader_destroy;
rd->super = super;
return rd;
}
-void sqfs_dir_reader_destroy(sqfs_dir_reader_t *rd)
-{
- sqfs_meta_reader_destroy(rd->meta_inode);
- sqfs_meta_reader_destroy(rd->meta_dir);
- free(rd);
-}
-
int sqfs_dir_reader_open_dir(sqfs_dir_reader_t *rd,
const sqfs_inode_generic_t *inode)
{