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/difftool/compare_files.c b/difftool/compare_files.c
index aa11f43..51b66bb 100644
--- a/difftool/compare_files.c
+++ b/difftool/compare_files.c
@@ -11,7 +11,7 @@ static unsigned char new_buf[MAX_WINDOW_SIZE];
 
 static int read_blob(const char *prefix, const char *path,
 		     sqfs_data_reader_t *rd, const sqfs_inode_generic_t *inode,
-		     void *buffer, uint64_t offset, size_t size)
+		     void *buffer, sqfs_u64 offset, size_t size)
 {
 	ssize_t ret;
 
@@ -30,7 +30,7 @@ static int read_blob(const char *prefix, const char *path,
 int compare_files(sqfsdiff_t *sd, const sqfs_inode_generic_t *old,
 		  const sqfs_inode_generic_t *new, const char *path)
 {
-	uint64_t offset, diff, oldsz, newsz;
+	sqfs_u64 offset, diff, oldsz, newsz;
 	int status = 0, ret;
 
 	sqfs_inode_get_file_size(old, &oldsz);
diff --git a/difftool/super.c b/difftool/super.c
index 14609dc..d0e2993 100644
--- a/difftool/super.c
+++ b/difftool/super.c
@@ -7,7 +7,7 @@
 #include "sqfsdiff.h"
 
 static const struct {
-	uint16_t mask;
+	sqfs_u16 mask;
 	const char *name;
 } sqfs_flags[] = {
 	{ SQFS_FLAG_UNCOMPRESSED_INODES, "uncompressed inodes" },
@@ -23,9 +23,9 @@ static const struct {
 	{ SQFS_FLAG_UNCOMPRESSED_IDS, "uncompressed ids" },
 };
 
-static void print_value_difference(const char *name, uint64_t a, uint64_t b)
+static void print_value_difference(const char *name, sqfs_u64 a, sqfs_u64 b)
 {
-	uint64_t diff;
+	sqfs_u64 diff;
 	char c;
 
 	if (a != b) {
@@ -41,15 +41,15 @@ static void print_value_difference(const char *name, uint64_t a, uint64_t b)
 	}
 }
 
-static void print_offset_diff(const char *name, uint64_t a, uint64_t b)
+static void print_offset_diff(const char *name, sqfs_u64 a, sqfs_u64 b)
 {
 	if (a != b)
 		fprintf(stdout, "Location of %s differs\n", name);
 }
 
-static void print_flag_diff(uint16_t a, uint16_t b)
+static void print_flag_diff(sqfs_u16 a, sqfs_u16 b)
 {
-	uint16_t diff = a ^ b, mask;
+	sqfs_u16 diff = a ^ b, mask;
 	size_t i;
 	char c;