From c9429aeece3b8642de637f7a21e68046bd690658 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sun, 23 Feb 2020 15:45:34 +0100 Subject: Remove the sqfs_inode_copy function With unified payload size counters, copying an inode is now trivial. Signed-off-by: David Oberhollenzer --- lib/sqfs/dir_reader.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'lib/sqfs/dir_reader.c') diff --git a/lib/sqfs/dir_reader.c b/lib/sqfs/dir_reader.c index 39e3e57..4e2a5b8 100644 --- a/lib/sqfs/dir_reader.c +++ b/lib/sqfs/dir_reader.c @@ -222,12 +222,19 @@ int sqfs_dir_reader_find_by_path(sqfs_dir_reader_t *rd, sqfs_inode_generic_t *inode; sqfs_dir_entry_t *ent; const char *ptr; - int ret; + int ret = 0; if (start == NULL) { ret = sqfs_dir_reader_get_root_inode(rd, &inode); } else { - ret = sqfs_inode_copy(start, &inode); + inode = alloc_flex(sizeof(*inode), 1, + start->payload_bytes_used); + if (inode == NULL) { + ret = SQFS_ERROR_ALLOC; + } else { + memcpy(inode, start, + sizeof(*start) + start->payload_bytes_used); + } } if (ret) -- cgit v1.2.3