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 --- mkfs/mkfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mkfs/mkfs.c') diff --git a/mkfs/mkfs.c b/mkfs/mkfs.c index 0d50afd..5746c69 100644 --- a/mkfs/mkfs.c +++ b/mkfs/mkfs.c @@ -33,7 +33,7 @@ static int pack_files(sqfs_data_writer_t *data, fstree_t *fs, { sqfs_inode_generic_t *inode; size_t max_blk_count; - uint64_t filesize; + sqfs_u64 filesize; sqfs_file_t *file; file_info_t *fi; int ret; @@ -58,7 +58,7 @@ static int pack_files(sqfs_data_writer_t *data, fstree_t *fs, if (filesize % fs->block_size) ++max_blk_count; - inode = alloc_flex(sizeof(*inode), sizeof(uint32_t), + inode = alloc_flex(sizeof(*inode), sizeof(sqfs_u32), max_blk_count); if (inode == NULL) { perror("creating file inode"); @@ -66,7 +66,7 @@ static int pack_files(sqfs_data_writer_t *data, fstree_t *fs, return -1; } - inode->block_sizes = (uint32_t *)inode->extra; + inode->block_sizes = (sqfs_u32 *)inode->extra; inode->base.type = SQFS_INODE_FILE; sqfs_inode_set_file_size(inode, filesize); sqfs_inode_set_frag_location(inode, 0xFFFFFFFF, 0xFFFFFFFF); -- cgit v1.2.3