[xfsprogs] kill off u_int*_t types

Commit Message

Felix Janda Aug. 6, 2016, 8:39 a.m. UTC

They were only used in two places and can be replaced by uint*_t.

Signed-off-by: Felix Janda <[e-mail]>
---
 db/check.c          | 2 +-
 include/darwin.h    | 8 ++------
 libxfs/xfs_format.h | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

Patch

diff --git a/db/check.c b/db/check.c
index 25146e5..f507148 100644
--- a/db/check.c
+++ b/db/check.c
@@ -3336,7 +3336,7 @@  process_quota(
 	int		cb;
 	xfs_dqblk_t	*dqb;
 	xfs_dqid_t	dqid;
-	u_int8_t	exp_flags = 0;
+	uint8_t		exp_flags = 0;
 	uint		i;
 	uint		perblock;
 	xfs_fileoff_t	qbno;
diff --git a/include/darwin.h b/include/darwin.h
index 45e0c03..b5076ce 100644
--- a/include/darwin.h
+++ b/include/darwin.h
@@ -130,15 +130,11 @@  typedef signed long long int	__s64;
 #define __int32_t	int32_t
 #define __int32_t	int32_t
 #define __int64_t	int64_t
-#define __uint8_t	u_int8_t
-#define __uint16_t	u_int16_t
-#define __uint32_t	u_int32_t
-#define __uint64_t	u_int64_t
 #define off64_t		off_t
 
 typedef off_t		xfs_off_t;
-typedef u_int64_t	xfs_ino_t;
-typedef u_int32_t	xfs_dev_t;
+typedef uint64_t	xfs_ino_t;
+typedef uint32_t	xfs_dev_t;
 typedef int64_t		xfs_daddr_t;
 
 #define stat64		stat
diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h
index f89b6e0..eb50a76 100644
--- a/libxfs/xfs_format.h
+++ b/libxfs/xfs_format.h
@@ -1109,7 +1109,7 @@  static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev)
  * Dquot and dquot block format definitions
  */
 #define XFS_DQUOT_MAGIC		0x4451		/* 'DQ' */
-#define XFS_DQUOT_VERSION	(u_int8_t)0x01	/* latest version number */
+#define XFS_DQUOT_VERSION	(uint8_t)0x01	/* latest version number */
 
 /*
  * This is the main portion of the on-disk representation of quota