From 57da296d0e31b87040510fa49eb75e950a4f0d67 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Mon, 23 Sep 2019 14:17:02 +0200 Subject: Replace user pointer in sqfs_block_t with explicit inode pointer Signed-off-by: David Oberhollenzer --- include/sqfs/block_processor.h | 8 +++----- include/sqfs/io.h | 11 ++++++----- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/sqfs/block_processor.h b/include/sqfs/block_processor.h index ca560f7..5e55908 100644 --- a/include/sqfs/block_processor.h +++ b/include/sqfs/block_processor.h @@ -128,16 +128,14 @@ struct sqfs_block_t { uint32_t checksum; /** - * @brief User settable file block index. - * - * Can be used for purposes like indexing the block size table. + * @brief Data block index within the inode. */ uint32_t index; /** - * @brief Arbitary user pointer associated with the block. + * @brief The squashfs inode related to this block. */ - void *user; + sqfs_inode_generic_t *inode; /** * @brief User settable flag field. diff --git a/include/sqfs/io.h b/include/sqfs/io.h index bbc3da9..f1a5ef0 100644 --- a/include/sqfs/io.h +++ b/include/sqfs/io.h @@ -179,15 +179,15 @@ SQFS_API sqfs_file_t *sqfs_get_stdin_file(uint64_t size); * @param file A pointer to a file implementation. * @param offset A byte offset into the file. * @param size The number of bytes to read, starting at the given offset. - * @param user A user pointer to set for the block. + * @param inode The inode pointer to set for the block. * @param flags The flags to store in the newly created block. * @param out Returns a pointer to a block on success. * * @return Zero on success, an @ref E_SQFS_ERROR identifier on failure. */ SQFS_API int sqfs_file_create_block(sqfs_file_t *file, uint64_t offset, - size_t size, void *user, uint32_t flags, - sqfs_block_t **out); + size_t size, sqfs_inode_generic_t *inode, + uint32_t flags, sqfs_block_t **out); /** * @brief Read a chunk from a condensed version of a sparse file and turn it @@ -205,7 +205,7 @@ SQFS_API int sqfs_file_create_block(sqfs_file_t *file, uint64_t offset, * @param file A pointer to a file implementation. * @param offset A byte offset into the file. * @param size The number of bytes to read, starting at the given offset. - * @param user A user pointer to set for the block. + * @param inode The inode pointer to set for the block. * @param flags The flags to store in the newly created block. * @param map Describes the data regions of the original sparse file. * @param out Returns a pointer to a block on success. @@ -213,7 +213,8 @@ SQFS_API int sqfs_file_create_block(sqfs_file_t *file, uint64_t offset, * @return Zero on success, an @ref E_SQFS_ERROR identifier on failure. */ SQFS_API int sqfs_file_create_block_dense(sqfs_file_t *file, uint64_t offset, - size_t size, void *user, + size_t size, + sqfs_inode_generic_t *inode, uint32_t flags, const sqfs_sparse_map_t *map, sqfs_block_t **out); -- cgit v1.2.3