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 <david.oberhollenzer@sigma-star.at>

1 files changed, 13 insertions, 13 deletions

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);