diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2020-02-12 02:22:31 +0100 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2020-02-12 02:26:24 +0100 |
| commit | 303680ebcd5adaac2934b63a0edc2d9d1a36d7fb (patch) | |
| tree | bd2012dc6fa56f7259dbe2e5edd7ab3042f8e0a0 /lib/sqfs/block_writer.c | |
| parent | ec7a522a520017327dd73b4d8e3787016ee1a31e (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/block_writer.c')
| -rw-r--r-- | lib/sqfs/block_writer.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/sqfs/block_writer.c b/lib/sqfs/block_writer.c index f77fcf8..63f8c61 100644 --- a/lib/sqfs/block_writer.c +++ b/lib/sqfs/block_writer.c @@ -26,6 +26,7 @@ typedef struct { } blk_info_t; struct sqfs_block_writer_t { + sqfs_object_t *base; sqfs_file_t *file; size_t num_blocks; @@ -115,6 +116,12 @@ static int align_file(sqfs_block_writer_t *wr) return store_block_location(wr, size, 0, 0); } +static void block_writer_destroy(sqfs_object_t *wr) +{ + free(((sqfs_block_writer_t *)wr)->blocks); + free(wr); +} + sqfs_block_writer_t *sqfs_block_writer_create(sqfs_file_t *file, size_t devblksz, sqfs_u32 flags) { @@ -127,6 +134,7 @@ sqfs_block_writer_t *sqfs_block_writer_create(sqfs_file_t *file, if (wr == NULL) return NULL; + ((sqfs_object_t *)wr)->destroy = block_writer_destroy; wr->file = file; wr->devblksz = devblksz; wr->max_blocks = INIT_BLOCK_COUNT; @@ -153,12 +161,6 @@ int sqfs_block_writer_set_hooks(sqfs_block_writer_t *wr, void *user_ptr, return 0; } -void sqfs_block_writer_destroy(sqfs_block_writer_t *wr) -{ - free(wr->blocks); - free(wr); -} - int sqfs_block_writer_write(sqfs_block_writer_t *wr, sqfs_u32 size, sqfs_u32 checksum, sqfs_u32 flags, const sqfs_u8 *data, sqfs_u64 *location) |