From 9d9d4505f58b6584fe3b261a7686c5d779f77c11 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 1 Sep 2019 23:08:04 +0200 Subject: Internalize the layout of the id_table_t structure As an opaque struct it has a chance to change its layout in the future without breaking ABI compatibiliy. Signed-off-by: David Oberhollenzer --- tar/tar2sqfs.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'tar/tar2sqfs.c') diff --git a/tar/tar2sqfs.c b/tar/tar2sqfs.c index c0f8a14..fba1a31 100644 --- a/tar/tar2sqfs.c +++ b/tar/tar2sqfs.c @@ -359,7 +359,7 @@ int main(int argc, char **argv) data_writer_t *data; sqfs_super_t super; compressor_t *cmp; - id_table_t idtbl; + id_table_t *idtbl; fstree_t fs; int ret; @@ -404,7 +404,8 @@ int main(int argc, char **argv) if (data == NULL) goto out_cmp; - if (id_table_init(&idtbl)) + idtbl = id_table_create(); + if (idtbl == NULL) goto out_data; if (process_tar_ball(&fs, data)) @@ -421,7 +422,7 @@ int main(int argc, char **argv) fstree_xattr_deduplicate(&fs); - if (sqfs_serialize_fstree(outfd, &super, &fs, cmp, &idtbl)) + if (sqfs_serialize_fstree(outfd, &super, &fs, cmp, idtbl)) goto out; if (data_writer_write_fragment_table(data)) @@ -432,7 +433,7 @@ int main(int argc, char **argv) goto out; } - if (id_table_write(&idtbl, outfd, &super, cmp)) + if (id_table_write(idtbl, outfd, &super, cmp)) goto out; if (write_xattr(outfd, &fs, &super, cmp)) @@ -451,7 +452,7 @@ int main(int argc, char **argv) status = EXIT_SUCCESS; out: - id_table_cleanup(&idtbl); + id_table_destroy(idtbl); out_data: data_writer_destroy(data); out_cmp: -- cgit v1.2.3