From 3946cf086183f8dd4d5d115f52ba1b87560b7ce4 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 4 Jul 2022 20:01:59 +0200 Subject: Move sqfs_tree_node_get_path to libsquashfs Signed-off-by: David Oberhollenzer --- bin/rdsquashfs/describe.c | 4 ++-- bin/rdsquashfs/fill_files.c | 4 ++-- bin/rdsquashfs/restore_fstree.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'bin/rdsquashfs') diff --git a/bin/rdsquashfs/describe.c b/bin/rdsquashfs/describe.c index e0e22bc..1e723bc 100644 --- a/bin/rdsquashfs/describe.c +++ b/bin/rdsquashfs/describe.c @@ -17,7 +17,7 @@ static int print_name(const sqfs_tree_node_t *n, bool dont_escape) if (canonicalize_name(name) != 0) { fprintf(stderr, "Error sanitizing file path '%s'\n", name); - free(name); + sqfs_free(name); return -1; } @@ -47,7 +47,7 @@ static int print_name(const sqfs_tree_node_t *n, bool dont_escape) fputc('"', stdout); } - free(name); + sqfs_free(name); return 0; } diff --git a/bin/rdsquashfs/fill_files.c b/bin/rdsquashfs/fill_files.c index 1afe6b8..8459c1e 100644 --- a/bin/rdsquashfs/fill_files.c +++ b/bin/rdsquashfs/fill_files.c @@ -89,7 +89,7 @@ static int add_file(const sqfs_tree_node_t *node) if (canonicalize_name(path)) { fprintf(stderr, "Invalid file path '%s'\n", path); - free(path); + sqfs_free(path); return -1; } @@ -104,7 +104,7 @@ static void clear_file_list(void) size_t i; for (i = 0; i < num_files; ++i) - free(files[i].path); + sqfs_free(files[i].path); free(files); files = NULL; diff --git a/bin/rdsquashfs/restore_fstree.c b/bin/rdsquashfs/restore_fstree.c index 57582c2..cf5bc2a 100644 --- a/bin/rdsquashfs/restore_fstree.c +++ b/bin/rdsquashfs/restore_fstree.c @@ -141,7 +141,7 @@ static int create_node_dfs(const sqfs_tree_node_t *n, int flags) printf("creating %s\n", name); ret = create_node(n, name, flags); - free(name); + sqfs_free(name); if (ret) return -1; @@ -276,10 +276,10 @@ static int set_attribs(sqfs_xattr_reader_t *xattr, } } - free(path); + sqfs_free(path); return 0; fail: - free(path); + sqfs_free(path); return -1; } -- cgit v1.2.3