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 <felix.janda@posteo.de>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/db/check.c b/db/check.c
index f7d0ba7b5851eb34ed773dbc271c57c51bd0073b..3afde02845d129616d5bab9d2d66e05d5d04716c 100644 (file)
--- 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 51031c42605c7265997110f047baa9d450f4a8ea..2632e1d6f08c12f0c152665098a37690b49c1183 100644 (file)
--- 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 d7bca1420fa44434d1b72b85af27124158cc6b7d..5b9ef297ec8ae631a70ef51e5ac183c22b70fc88 100644 (file)
--- 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 79a72bb741ce7be4cc9be93829ca85ec9e3e1855..b214352ceaa14b27c736a5286516f7d961db6002 100644 (file)
--- 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