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>

1 files changed, 12 insertions, 7 deletions

diff --git a/lib/sqfs/frag_table.c b/lib/sqfs/frag_table.c
index 200f3d5..58851c5 100644
--- a/lib/sqfs/frag_table.c
+++ b/lib/sqfs/frag_table.c
@@ -27,6 +27,8 @@ typedef struct {
 
 
 struct sqfs_frag_table_t {
+	sqfs_object_t base;
+
 	size_t capacity;
 	size_t used;
 	sqfs_fragment_t *table;
@@ -37,6 +39,15 @@ struct sqfs_frag_table_t {
 	chunk_info_t *chunk_list;
 };
 
+static void frag_table_destroy(sqfs_object_t *obj)
+{
+	sqfs_frag_table_t *tbl = (sqfs_frag_table_t *)obj;
+
+	free(tbl->chunk_list);
+	free(tbl->table);
+	free(tbl);
+}
+
 sqfs_frag_table_t *sqfs_frag_table_create(sqfs_u32 flags)
 {
 	sqfs_frag_table_t *tbl;
@@ -48,16 +59,10 @@ sqfs_frag_table_t *sqfs_frag_table_create(sqfs_u32 flags)
 	if (tbl == NULL)
 		return NULL;
 
+	((sqfs_object_t *)tbl)->destroy = frag_table_destroy;
 	return tbl;
 }
 
-void sqfs_frag_table_destroy(sqfs_frag_table_t *tbl)
-{
-	free(tbl->chunk_list);
-	free(tbl->table);
-	free(tbl);
-}
-
 int sqfs_frag_table_read(sqfs_frag_table_t *tbl, sqfs_file_t *file,
 			 const sqfs_super_t *super, sqfs_compressor_t *cmp)
 {