From 81043eae673da9445b8f6095020989d586cc96e1 Mon Sep 17 00:00:00 2001 From: Felix Janda Date: Thu, 9 Nov 2017 11:34:53 -0600 Subject: [PATCH] kill off u_int*_t types They were only used in two places and can be replaced by uint*_t. Signed-off-by: Felix Janda Reviewed-by: Eric Sandeen Signed-off-by: Eric Sandeen --- db/check.c | 2 +- include/darwin.h | 8 ++------ libxfs/freebsd.c | 2 +- libxfs/xfs_format.h | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/db/check.c b/db/check.c index f7d0ba7b5..3afde0284 100644 --- a/db/check.c +++ b/db/check.c @@ -3381,7 +3381,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 51031c426..2632e1d6f 100644 --- a/include/darwin.h +++ b/include/darwin.h @@ -130,14 +130,10 @@ 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 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; typedef __u32 xfs_nlink_t; diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c index d7bca1420..5b9ef297e 100644 --- a/libxfs/freebsd.c +++ b/libxfs/freebsd.c @@ -110,7 +110,7 @@ platform_findsizes(char *path, int fd, long long *sz, int *bsz) { struct stat st; int64_t size; - u_int ssize; + uint ssize; if (fstat(fd, &st) < 0) { fprintf(stderr, _("%s: " diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h index 79a72bb74..b214352ce 100644 --- a/libxfs/xfs_format.h +++ b/libxfs/xfs_format.h @@ -1142,7 +1142,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 -- 2.47.2