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/data_writer/block.c | 8 ++++---- lib/sqfs/data_writer/common.c | 4 ++-- lib/sqfs/data_writer/fileapi.c | 2 +- lib/sqfs/data_writer/fragment.c | 4 ++-- lib/sqfs/data_writer/internal.h | 26 +++++++++++++------------- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'lib/sqfs/data_writer') diff --git a/lib/sqfs/data_writer/block.c b/lib/sqfs/data_writer/block.c index 9c40793..5dce26c 100644 --- a/lib/sqfs/data_writer/block.c +++ b/lib/sqfs/data_writer/block.c @@ -9,8 +9,8 @@ #include -static int store_block_location(sqfs_data_writer_t *proc, uint64_t offset, - uint32_t size, uint32_t chksum) +static int store_block_location(sqfs_data_writer_t *proc, sqfs_u64 offset, + sqfs_u32 size, sqfs_u32 chksum) { size_t new_sz; void *new; @@ -61,9 +61,9 @@ static int allign_file(sqfs_data_writer_t *proc, sqfs_block_t *blk) int process_completed_block(sqfs_data_writer_t *proc, sqfs_block_t *blk) { - uint64_t offset, bytes; + sqfs_u64 offset, bytes; size_t start, count; - uint32_t out; + sqfs_u32 out; int err; if (proc->hooks != NULL && proc->hooks->pre_block_write != NULL) { diff --git a/lib/sqfs/data_writer/common.c b/lib/sqfs/data_writer/common.c index 9e11e36..059ef41 100644 --- a/lib/sqfs/data_writer/common.c +++ b/lib/sqfs/data_writer/common.c @@ -99,7 +99,7 @@ sqfs_block_t *data_writer_next_work_item(sqfs_data_writer_t *proc) } int data_writer_do_block(sqfs_block_t *block, sqfs_compressor_t *cmp, - uint8_t *scratch, size_t scratch_size) + sqfs_u8 *scratch, size_t scratch_size) { ssize_t ret; @@ -132,7 +132,7 @@ int data_writer_do_block(sqfs_block_t *block, sqfs_compressor_t *cmp, int sqfs_data_writer_write_fragment_table(sqfs_data_writer_t *proc, sqfs_super_t *super) { - uint64_t start; + sqfs_u64 start; size_t size; int ret; diff --git a/lib/sqfs/data_writer/fileapi.c b/lib/sqfs/data_writer/fileapi.c index 712fd29..2a5d02a 100644 --- a/lib/sqfs/data_writer/fileapi.c +++ b/lib/sqfs/data_writer/fileapi.c @@ -26,7 +26,7 @@ static int add_sentinel_block(sqfs_data_writer_t *proc) } int sqfs_data_writer_begin_file(sqfs_data_writer_t *proc, - sqfs_inode_generic_t *inode, uint32_t flags) + sqfs_inode_generic_t *inode, sqfs_u32 flags) { if (proc->inode != NULL) return test_and_set_status(proc, SQFS_ERROR_INTERNAL); diff --git a/lib/sqfs/data_writer/fragment.c b/lib/sqfs/data_writer/fragment.c index 9f169b7..1957983 100644 --- a/lib/sqfs/data_writer/fragment.c +++ b/lib/sqfs/data_writer/fragment.c @@ -49,7 +49,7 @@ static int grow_deduplication_list(sqfs_data_writer_t *proc) } static int store_fragment(sqfs_data_writer_t *proc, sqfs_block_t *frag, - uint64_t hash) + sqfs_u64 hash) { int err = grow_deduplication_list(proc); @@ -79,7 +79,7 @@ static int store_fragment(sqfs_data_writer_t *proc, sqfs_block_t *frag, int process_completed_fragment(sqfs_data_writer_t *proc, sqfs_block_t *frag, sqfs_block_t **blk_out) { - uint64_t hash; + sqfs_u64 hash; size_t i, size; int err; diff --git a/lib/sqfs/data_writer/internal.h b/lib/sqfs/data_writer/internal.h index b1d9d8c..c12d89c 100644 --- a/lib/sqfs/data_writer/internal.h +++ b/lib/sqfs/data_writer/internal.h @@ -28,20 +28,20 @@ #define MK_BLK_HASH(chksum, size) \ - (((uint64_t)(size) << 32) | (uint64_t)(chksum)) + (((sqfs_u64)(size) << 32) | (sqfs_u64)(chksum)) #define INIT_BLOCK_COUNT (128) typedef struct { - uint64_t offset; - uint64_t hash; + sqfs_u64 offset; + sqfs_u64 hash; } blk_info_t; typedef struct { - uint32_t index; - uint32_t offset; - uint64_t hash; + sqfs_u32 index; + sqfs_u32 offset; + sqfs_u64 hash; } frag_info_t; @@ -50,7 +50,7 @@ typedef struct { sqfs_data_writer_t *shared; sqfs_compressor_t *cmp; pthread_t thread; - uint8_t scratch[]; + sqfs_u8 scratch[]; } compress_worker_t; #endif @@ -71,8 +71,8 @@ struct sqfs_data_writer_t { int status; /* used by main thread only */ - uint32_t enqueue_id; - uint32_t dequeue_id; + sqfs_u32 enqueue_id; + sqfs_u32 dequeue_id; unsigned int num_workers; size_t max_backlog; @@ -84,7 +84,7 @@ struct sqfs_data_writer_t { size_t num_fragments; size_t max_fragments; - uint64_t start; + sqfs_u64 start; size_t file_start; size_t num_blocks; @@ -103,7 +103,7 @@ struct sqfs_data_writer_t { /* file API */ sqfs_inode_generic_t *inode; sqfs_block_t *blk_current; - uint32_t blk_flags; + sqfs_u32 blk_flags; size_t blk_index; /* used only by workers */ @@ -112,7 +112,7 @@ struct sqfs_data_writer_t { #ifdef WITH_PTHREAD compress_worker_t *workers[]; #else - uint8_t scratch[]; + sqfs_u8 scratch[]; #endif }; @@ -141,7 +141,7 @@ sqfs_block_t *data_writer_next_work_item(sqfs_data_writer_t *proc); SQFS_INTERNAL int data_writer_do_block(sqfs_block_t *block, sqfs_compressor_t *cmp, - uint8_t *scratch, size_t scratch_size); + sqfs_u8 *scratch, size_t scratch_size); SQFS_INTERNAL int test_and_set_status(sqfs_data_writer_t *proc, int status); -- cgit v1.2.3