diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-12-04 01:33:45 +0100 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2023-01-19 16:24:56 +0100 |
| commit | 47f24f2a8faf71395a1d054e9823beb000442cce (patch) | |
| tree | dd01d8b69125b3dda444c9b92437ad0c5a0af9bc /bin/rdsquashfs | |
| parent | 4160b50a0b4c51f8b7191928cdf38d9fb0147fe2 (diff) | |
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 <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'bin/rdsquashfs')
| -rw-r--r-- | bin/rdsquashfs/fill_files.c | 2 | ||||
| -rw-r--r-- | bin/rdsquashfs/rdsquashfs.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/bin/rdsquashfs/fill_files.c b/bin/rdsquashfs/fill_files.c index 923bc12..3104146 100644 --- a/bin/rdsquashfs/fill_files.c +++ b/bin/rdsquashfs/fill_files.c @@ -158,7 +158,7 @@ static int fill_files(sqfs_data_reader_t *data, int flags) if (ret == 0) ret = ostream_flush(fp); - sqfs_destroy(fp); + sqfs_drop(fp); if (ret) return -1; } diff --git a/bin/rdsquashfs/rdsquashfs.c b/bin/rdsquashfs/rdsquashfs.c index 206b754..a18ac7f 100644 --- a/bin/rdsquashfs/rdsquashfs.c +++ b/bin/rdsquashfs/rdsquashfs.c @@ -221,11 +221,11 @@ int main(int argc, char **argv) if (sqfs_data_reader_dump(opt.cmdpath, data, n->inode, fp, super.block_size)) { - sqfs_destroy(fp); + sqfs_drop(fp); goto out; } - sqfs_destroy(fp); + sqfs_drop(fp); break; } case OP_UNPACK: @@ -267,18 +267,18 @@ int main(int argc, char **argv) out: sqfs_dir_tree_destroy(n); out_data: - sqfs_destroy(data); + sqfs_drop(data); out_dr: - sqfs_destroy(dirrd); + sqfs_drop(dirrd); out_id: - sqfs_destroy(idtbl); + sqfs_drop(idtbl); out_xr: if (xattr != NULL) - sqfs_destroy(xattr); + sqfs_drop(xattr); out_cmp: - sqfs_destroy(cmp); + sqfs_drop(cmp); out_file: - sqfs_destroy(file); + sqfs_drop(file); out_cmd: free(opt.cmdpath); return status; |