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>

5 files changed, 10 insertions, 10 deletions

diff --git a/unpack/describe.c b/unpack/describe.c
index 336eb4d..4c35070 100644
--- a/unpack/describe.c
+++ b/unpack/describe.c
@@ -93,7 +93,7 @@ int describe_tree(const sqfs_tree_node_t *root, const char *unpack_root)
 	case S_IFCHR:
 	case S_IFBLK: {
 		char buffer[32];
-		uint32_t devno;
+		sqfs_u32 devno;
 
 		if (root->inode->base.type == SQFS_INODE_EXT_BDEV ||
 		    root->inode->base.type == SQFS_INODE_EXT_CDEV) {
diff --git a/unpack/dump_xattrs.c b/unpack/dump_xattrs.c
index 13bddfe..b7611a9 100644
--- a/unpack/dump_xattrs.c
+++ b/unpack/dump_xattrs.c
@@ -11,7 +11,7 @@ int dump_xattrs(sqfs_xattr_reader_t *xattr, const sqfs_inode_generic_t *inode)
 	sqfs_xattr_value_t *value;
 	sqfs_xattr_entry_t *key;
 	sqfs_xattr_id_t desc;
-	uint32_t index;
+	sqfs_u32 index;
 	size_t i;
 
 	if (xattr == NULL)
diff --git a/unpack/fill_files.c b/unpack/fill_files.c
index 3d1e7b2..12b39fb 100644
--- a/unpack/fill_files.c
+++ b/unpack/fill_files.c
@@ -17,8 +17,8 @@ static size_t block_size = 0;
 
 static int compare_files(const void *l, const void *r)
 {
-	uint32_t lhs_frag_idx, lhs_frag_off, rhs_frag_idx, rhs_frag_off;
-	uint64_t lhs_size, rhs_size, lhs_start, rhs_start;
+	sqfs_u32 lhs_frag_idx, lhs_frag_off, rhs_frag_idx, rhs_frag_off;
+	sqfs_u64 lhs_size, rhs_size, lhs_start, rhs_start;
 	const struct file_ent *lhs = l, *rhs = r;
 
 	sqfs_inode_get_frag_location(lhs->inode, &lhs_frag_idx, &lhs_frag_off);
diff --git a/unpack/list_files.c b/unpack/list_files.c
index ae259bd..0d64010 100644
--- a/unpack/list_files.c
+++ b/unpack/list_files.c
@@ -6,7 +6,7 @@
  */
 #include "rdsquashfs.h"
 
-static void mode_to_str(uint16_t mode, char *p)
+static void mode_to_str(sqfs_u16 mode, char *p)
 {
 	switch (mode & S_IFMT) {
 	case S_IFDIR:  *(p++) = 'd'; break;
@@ -64,7 +64,7 @@ static int count_int_chars(unsigned int i)
 	return count;
 }
 
-static void print_size(uint64_t size, char *buffer)
+static void print_size(sqfs_u64 size, char *buffer)
 {
 	static const char *suffices = "kMGTPEZY";
 	int suffix = -1;
@@ -88,7 +88,7 @@ static void print_node_size(const sqfs_tree_node_t *n, char *buffer)
 		print_size(strlen(n->inode->slink_target), buffer);
 		break;
 	case S_IFREG: {
-		uint64_t size;
+		sqfs_u64 size;
 		sqfs_inode_get_file_size(n->inode, &size);
 		print_size(size, buffer);
 		break;
@@ -102,7 +102,7 @@ static void print_node_size(const sqfs_tree_node_t *n, char *buffer)
 		break;
 	case S_IFBLK:
 	case S_IFCHR: {
-		uint32_t devno;
+		sqfs_u32 devno;
 
 		if (n->inode->base.type == SQFS_INODE_EXT_BDEV ||
 		    n->inode->base.type == SQFS_INODE_EXT_CDEV) {
diff --git a/unpack/restore_fstree.c b/unpack/restore_fstree.c
index 5b82de4..1736c47 100644
--- a/unpack/restore_fstree.c
+++ b/unpack/restore_fstree.c
@@ -56,7 +56,7 @@ static int create_node(const sqfs_tree_node_t *n, int flags)
 		break;
 	case S_IFBLK:
 	case S_IFCHR: {
-		uint32_t devno;
+		sqfs_u32 devno;
 
 		if (n->inode->base.type == SQFS_INODE_EXT_BDEV ||
 		    n->inode->base.type == SQFS_INODE_EXT_CDEV) {
@@ -97,7 +97,7 @@ static int set_xattr(sqfs_xattr_reader_t *xattr, const sqfs_tree_node_t *n)
 	sqfs_xattr_value_t *value;
 	sqfs_xattr_entry_t *key;
 	sqfs_xattr_id_t desc;
-	uint32_t index;
+	sqfs_u32 index;
 	size_t i;
 	int ret;