diff options
Diffstat (limited to 'lib/sqfs')
| -rw-r--r-- | lib/sqfs/dir_reader.c | 11 | ||||
| -rw-r--r-- | lib/sqfs/inode.c | 14 |
2 files changed, 9 insertions, 16 deletions
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) diff --git a/lib/sqfs/inode.c b/lib/sqfs/inode.c index bda244b..02d23e2 100644 --- a/lib/sqfs/inode.c +++ b/lib/sqfs/inode.c @@ -33,20 +33,6 @@ static int inverse_type[] = { [SQFS_INODE_EXT_SOCKET] = SQFS_INODE_SOCKET, }; -int sqfs_inode_copy(const sqfs_inode_generic_t *src, - sqfs_inode_generic_t **out) -{ - size_t size = sizeof(*src) + src->payload_bytes_used; - sqfs_inode_generic_t *copy = calloc(1, size); - - if (copy == NULL) - return SQFS_ERROR_ALLOC; - - memcpy(copy, src, size); - *out = copy; - return 0; -} - int sqfs_inode_get_xattr_index(const sqfs_inode_generic_t *inode, sqfs_u32 *out) { |