Add a helper function to initialize libsquashfs objects

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

5 files changed, 10 insertions, 10 deletions

diff --git a/lib/sqfs/comp/gzip.c b/lib/sqfs/comp/gzip.c
index 39d4227..beacfb8 100644
--- a/lib/sqfs/comp/gzip.c
+++ b/lib/sqfs/comp/gzip.c
@@ -277,6 +277,8 @@ int gzip_compressor_create(const sqfs_compressor_config_t *cfg,
 	if (gzip == NULL)
 		return SQFS_ERROR_ALLOC;
 
+	sqfs_object_init(gzip, gzip_destroy, gzip_create_copy);
+
 	gzip->opt.level = cfg->level;
 	gzip->opt.window = cfg->opt.gzip.window_size;
 	gzip->opt.strategies = cfg->flags & SQFS_COMP_FLAG_GZIP_ALL;
@@ -286,8 +288,6 @@ int gzip_compressor_create(const sqfs_compressor_config_t *cfg,
 	base->do_block = gzip_do_block;
 	base->write_options = gzip_write_options;
 	base->read_options = gzip_read_options;
-	((sqfs_object_t *)base)->copy = gzip_create_copy;
-	((sqfs_object_t *)base)->destroy = gzip_destroy;
 
 	if (gzip->compress) {
 		ret = deflateInit2(&gzip->strm, cfg->level,
diff --git a/lib/sqfs/comp/lz4.c b/lib/sqfs/comp/lz4.c
index 152ae75..77f4a6e 100644
--- a/lib/sqfs/comp/lz4.c
+++ b/lib/sqfs/comp/lz4.c
@@ -156,6 +156,8 @@ int lz4_compressor_create(const sqfs_compressor_config_t *cfg,
 	if (lz4 == NULL)
 		return SQFS_ERROR_ALLOC;
 
+	sqfs_object_init(lz4, lz4_destroy, lz4_create_copy);
+
 	lz4->high_compression = (cfg->flags & SQFS_COMP_FLAG_LZ4_HC) != 0;
 	lz4->block_size = cfg->block_size;
 
@@ -164,8 +166,6 @@ int lz4_compressor_create(const sqfs_compressor_config_t *cfg,
 		lz4_uncomp_block : lz4_comp_block;
 	base->write_options = lz4_write_options;
 	base->read_options = lz4_read_options;
-	((sqfs_object_t *)base)->copy = lz4_create_copy;
-	((sqfs_object_t *)base)->destroy = lz4_destroy;
 
 	*out = base;
 	return 0;
diff --git a/lib/sqfs/comp/lzma.c b/lib/sqfs/comp/lzma.c
index 01e6042..5456603 100644
--- a/lib/sqfs/comp/lzma.c
+++ b/lib/sqfs/comp/lzma.c
@@ -260,6 +260,8 @@ int lzma_compressor_create(const sqfs_compressor_config_t *cfg,
 	if (lzma == NULL)
 		return SQFS_ERROR_ALLOC;
 
+	sqfs_object_init(lzma, lzma_destroy, lzma_create_copy);
+
 	lzma->block_size = cfg->block_size;
 	lzma->flags = cfg->flags;
 	lzma->level = cfg->level;
@@ -273,8 +275,6 @@ int lzma_compressor_create(const sqfs_compressor_config_t *cfg,
 		lzma_uncomp_block : lzma_comp_block;
 	base->write_options = lzma_write_options;
 	base->read_options = lzma_read_options;
-	((sqfs_object_t *)base)->copy = lzma_create_copy;
-	((sqfs_object_t *)base)->destroy = lzma_destroy;
 
 	*out = base;
 	return 0;
diff --git a/lib/sqfs/comp/xz.c b/lib/sqfs/comp/xz.c
index 3fb27b2..13545ed 100644
--- a/lib/sqfs/comp/xz.c
+++ b/lib/sqfs/comp/xz.c
@@ -304,6 +304,8 @@ int xz_compressor_create(const sqfs_compressor_config_t *cfg,
 	if (xz == NULL)
 		return SQFS_ERROR_ALLOC;
 
+	sqfs_object_init(xz, xz_destroy, xz_create_copy);
+
 	xz->flags = cfg->flags;
 	xz->dict_size = cfg->opt.xz.dict_size;
 	xz->block_size = cfg->block_size;
@@ -316,8 +318,6 @@ int xz_compressor_create(const sqfs_compressor_config_t *cfg,
 		xz_uncomp_block : xz_comp_block;
 	base->write_options = xz_write_options;
 	base->read_options = xz_read_options;
-	((sqfs_object_t *)base)->copy = xz_create_copy;
-	((sqfs_object_t *)base)->destroy = xz_destroy;
 
 	*out = base;
 	return 0;
diff --git a/lib/sqfs/comp/zstd.c b/lib/sqfs/comp/zstd.c
index af5bd84..a6d7975 100644
--- a/lib/sqfs/comp/zstd.c
+++ b/lib/sqfs/comp/zstd.c
@@ -151,6 +151,8 @@ int zstd_compressor_create(const sqfs_compressor_config_t *cfg,
 	if (zstd == NULL)
 		return SQFS_ERROR_ALLOC;
 
+	sqfs_object_init(zstd, zstd_destroy, zstd_create_copy);
+
 	zstd->block_size = cfg->block_size;
 	zstd->level = cfg->level;
 	zstd->zctx = ZSTD_createCCtx();
@@ -164,8 +166,6 @@ int zstd_compressor_create(const sqfs_compressor_config_t *cfg,
 		zstd_uncomp_block : zstd_comp_block;
 	base->write_options = zstd_write_options;
 	base->read_options = zstd_read_options;
-	((sqfs_object_t *)base)->copy = zstd_create_copy;
-	((sqfs_object_t *)base)->destroy = zstd_destroy;
 
 	*out = base;
 	return 0;