From 40232f4bd4d7e8e001f7d1e8f120606f59b2c147 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Fri, 27 Sep 2019 18:15:40 +0200 Subject: Cleanup: replace fixed with data types with typedefs This is a fully automated search and replace, i.e. I ran this: git grep -l uint8_t | xargs sed -i 's/uint8_t/sqfs_u8/g' git grep -l uint16_t | xargs sed -i 's/uint16_t/sqfs_u16/g' git grep -l uint32_t | xargs sed -i 's/uint32_t/sqfs_u32/g' git grep -l uint64_t | xargs sed -i 's/uint64_t/sqfs_u64/g' git grep -l int8_t | xargs sed -i 's/int8_t/sqfs_s8/g' git grep -l int16_t | xargs sed -i 's/int16_t/sqfs_s16/g' git grep -l int32_t | xargs sed -i 's/int32_t/sqfs_s32/g' git grep -l int64_t | xargs sed -i 's/int64_t/sqfs_s64/g' and than added the appropriate definitions to sqfs/predef.h The whole point being better compatibillity with platforms that may not have an stdint.h with the propper definitions. Signed-off-by: David Oberhollenzer --- lib/sqfs/inode.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/sqfs/inode.c') diff --git a/lib/sqfs/inode.c b/lib/sqfs/inode.c index d6c013c..334ffd8 100644 --- a/lib/sqfs/inode.c +++ b/lib/sqfs/inode.c @@ -28,7 +28,7 @@ static int inverse_type[] = { }; int sqfs_inode_get_xattr_index(const sqfs_inode_generic_t *inode, - uint32_t *out) + sqfs_u32 *out) { switch (inode->base.type) { case SQFS_INODE_DIR: @@ -122,7 +122,7 @@ int sqfs_inode_make_extended(sqfs_inode_generic_t *inode) int sqfs_inode_make_basic(sqfs_inode_generic_t *inode) { - uint32_t xattr; + sqfs_u32 xattr; int err; err = sqfs_inode_get_xattr_index(inode, &xattr); @@ -187,7 +187,7 @@ int sqfs_inode_make_basic(sqfs_inode_generic_t *inode) return 0; } -int sqfs_inode_set_file_size(sqfs_inode_generic_t *inode, uint64_t size) +int sqfs_inode_set_file_size(sqfs_inode_generic_t *inode, sqfs_u64 size) { if (inode->base.type == SQFS_INODE_EXT_FILE) { inode->data.file_ext.file_size = size; @@ -209,7 +209,7 @@ int sqfs_inode_set_file_size(sqfs_inode_generic_t *inode, uint64_t size) } int sqfs_inode_set_frag_location(sqfs_inode_generic_t *inode, - uint32_t index, uint32_t offset) + sqfs_u32 index, sqfs_u32 offset) { if (inode->base.type == SQFS_INODE_EXT_FILE) { inode->data.file_ext.fragment_idx = index; @@ -225,7 +225,7 @@ int sqfs_inode_set_frag_location(sqfs_inode_generic_t *inode, } int sqfs_inode_set_file_block_start(sqfs_inode_generic_t *inode, - uint64_t location) + sqfs_u64 location) { if (inode->base.type == SQFS_INODE_EXT_FILE) { inode->data.file_ext.blocks_start = location; @@ -246,7 +246,7 @@ int sqfs_inode_set_file_block_start(sqfs_inode_generic_t *inode, return 0; } -int sqfs_inode_get_file_size(const sqfs_inode_generic_t *inode, uint64_t *size) +int sqfs_inode_get_file_size(const sqfs_inode_generic_t *inode, sqfs_u64 *size) { if (inode->base.type == SQFS_INODE_EXT_FILE) { *size = inode->data.file_ext.file_size; @@ -260,7 +260,7 @@ int sqfs_inode_get_file_size(const sqfs_inode_generic_t *inode, uint64_t *size) } int sqfs_inode_get_frag_location(const sqfs_inode_generic_t *inode, - uint32_t *index, uint32_t *offset) + sqfs_u32 *index, sqfs_u32 *offset) { if (inode->base.type == SQFS_INODE_EXT_FILE) { *index = inode->data.file_ext.fragment_idx; @@ -276,7 +276,7 @@ int sqfs_inode_get_frag_location(const sqfs_inode_generic_t *inode, } int sqfs_inode_get_file_block_start(const sqfs_inode_generic_t *inode, - uint64_t *location) + sqfs_u64 *location) { if (inode->base.type == SQFS_INODE_EXT_FILE) { *location = inode->data.file_ext.blocks_start; -- cgit v1.2.3