From 47f24f2a8faf71395a1d054e9823beb000442cce Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 4 Dec 2022 01:33:45 +0100 Subject: Implement rudimentary reference counting for sqfs_object_t Implement grab/drop functions to increase/decrease reference count and destroy the object if the count drops to 0. Make sure that all objects that maintain internal references actually grab that reference, duplicate it in the copy function, drop it in the destroy handler. Signed-off-by: David Oberhollenzer --- tests/libtar/tar_big_file.c | 2 +- tests/libtar/tar_fuzz.c | 4 ++-- tests/libtar/tar_simple.c | 2 +- tests/libtar/tar_sparse.c | 2 +- tests/libtar/tar_sparse_gnu.c | 2 +- tests/libtar/tar_target_filled.c | 3 +-- tests/libtar/tar_xattr.c | 2 +- tests/libtar/tar_xattr_bin.c | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) (limited to 'tests/libtar') diff --git a/tests/libtar/tar_big_file.c b/tests/libtar/tar_big_file.c index dbeefac..deb41f4 100644 --- a/tests/libtar/tar_big_file.c +++ b/tests/libtar/tar_big_file.c @@ -26,6 +26,6 @@ int main(int argc, char **argv) TEST_STR_EQUAL(hdr.name, "big-file.bin"); TEST_ASSERT(!hdr.unknown_record); clear_header(&hdr); - sqfs_destroy(fp); + sqfs_drop(fp); return EXIT_SUCCESS; } diff --git a/tests/libtar/tar_fuzz.c b/tests/libtar/tar_fuzz.c index 5942426..21e6978 100644 --- a/tests/libtar/tar_fuzz.c +++ b/tests/libtar/tar_fuzz.c @@ -41,9 +41,9 @@ int main(int argc, char **argv) goto fail; } - sqfs_destroy(fp); + sqfs_drop(fp); return EXIT_SUCCESS; fail: - sqfs_destroy(fp); + sqfs_drop(fp); return EXIT_FAILURE; } diff --git a/tests/libtar/tar_simple.c b/tests/libtar/tar_simple.c index 8879f05..cb38abb 100644 --- a/tests/libtar/tar_simple.c +++ b/tests/libtar/tar_simple.c @@ -59,6 +59,6 @@ int main(int argc, char **argv) buffer[5] = '\0'; TEST_STR_EQUAL(buffer, "test\n"); clear_header(&hdr); - sqfs_destroy(fp); + sqfs_drop(fp); return EXIT_SUCCESS; } diff --git a/tests/libtar/tar_sparse.c b/tests/libtar/tar_sparse.c index 511c7ba..27ce053 100644 --- a/tests/libtar/tar_sparse.c +++ b/tests/libtar/tar_sparse.c @@ -75,7 +75,7 @@ static void test_case_sparse(const char *path) TEST_NULL(sparse); clear_header(&hdr); - sqfs_destroy(fp); + sqfs_drop(fp); } int main(int argc, char **argv) diff --git a/tests/libtar/tar_sparse_gnu.c b/tests/libtar/tar_sparse_gnu.c index 37167d3..19ddd0a 100644 --- a/tests/libtar/tar_sparse_gnu.c +++ b/tests/libtar/tar_sparse_gnu.c @@ -47,6 +47,6 @@ int main(int argc, char **argv) TEST_NULL(sparse->next); clear_header(&hdr); - sqfs_destroy(fp); + sqfs_drop(fp); return EXIT_SUCCESS; } diff --git a/tests/libtar/tar_target_filled.c b/tests/libtar/tar_target_filled.c index 6c83170..abc6a47 100644 --- a/tests/libtar/tar_target_filled.c +++ b/tests/libtar/tar_target_filled.c @@ -104,7 +104,6 @@ int main(int argc, char **argv) /* end of file */ TEST_ASSERT(read_header(fp, &hdr) > 0); - sqfs_destroy(fp); - + sqfs_drop(fp); return EXIT_SUCCESS; } diff --git a/tests/libtar/tar_xattr.c b/tests/libtar/tar_xattr.c index 4b3ed21..122d1db 100644 --- a/tests/libtar/tar_xattr.c +++ b/tests/libtar/tar_xattr.c @@ -37,6 +37,6 @@ int main(int argc, char **argv) TEST_NULL(hdr.xattr->next); clear_header(&hdr); - sqfs_destroy(fp); + sqfs_drop(fp); return EXIT_SUCCESS; } diff --git a/tests/libtar/tar_xattr_bin.c b/tests/libtar/tar_xattr_bin.c index b5644a1..90443a1 100644 --- a/tests/libtar/tar_xattr_bin.c +++ b/tests/libtar/tar_xattr_bin.c @@ -45,6 +45,6 @@ int main(int argc, char **argv) TEST_NULL(hdr.xattr->next); clear_header(&hdr); - sqfs_destroy(fp); + sqfs_drop(fp); return EXIT_SUCCESS; } -- cgit v1.2.3