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>

2 files changed, 8 insertions, 8 deletions

diff --git a/lib/util/padd_file.c b/lib/util/padd_file.c
index 8c7120b..53e1a42 100644
--- a/lib/util/padd_file.c
+++ b/lib/util/padd_file.c
@@ -12,11 +12,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-int padd_file(int outfd, uint64_t size, size_t blocksize)
+int padd_file(int outfd, sqfs_u64 size, size_t blocksize)
 {
 	size_t padd_sz = size % blocksize;
 	int status = -1;
-	uint8_t *buffer;
+	sqfs_u8 *buffer;
 
 	if (padd_sz == 0)
 		return 0;
@@ -41,11 +41,11 @@ fail_errno:
 	goto out;
 }
 
-int padd_sqfs(sqfs_file_t *file, uint64_t size, size_t blocksize)
+int padd_sqfs(sqfs_file_t *file, sqfs_u64 size, size_t blocksize)
 {
 	size_t padd_sz = size % blocksize;
 	int status = -1;
-	uint8_t *buffer;
+	sqfs_u8 *buffer;
 
 	if (padd_sz == 0)
 		return 0;
diff --git a/lib/util/str_table.c b/lib/util/str_table.c
index 5f6543e..dba61fe 100644
--- a/lib/util/str_table.c
+++ b/lib/util/str_table.c
@@ -15,10 +15,10 @@
 #include "util.h"
 
 /* R5 hash function (borrowed from reiserfs) */
-static uint32_t strhash(const char *s)
+static sqfs_u32 strhash(const char *s)
 {
 	const signed char *str = (const signed char *)s;
-	uint32_t a = 0;
+	sqfs_u32 a = 0;
 
 	while (*str != '\0') {
 		a += *str << 4;
@@ -89,7 +89,7 @@ void str_table_cleanup(str_table_t *table)
 int str_table_get_index(str_table_t *table, const char *str, size_t *idx)
 {
 	str_bucket_t *bucket;
-	uint32_t hash;
+	sqfs_u32 hash;
 	size_t index;
 
 	hash = strhash(str);
@@ -140,7 +140,7 @@ const char *str_table_get_string(str_table_t *table, size_t index)
 static str_bucket_t *bucket_by_index(str_table_t *table, size_t index)
 {
 	str_bucket_t *bucket = NULL;
-	uint32_t hash;
+	sqfs_u32 hash;
 
 	if (index < table->num_strings) {
 		hash = strhash(table->strings[index]);