From patchwork Sat Aug 6 08:39:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Janda X-Patchwork-Id: 9265895 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6316260754 for ; Sat, 6 Aug 2016 08:40:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5397728418 for ; Sat, 6 Aug 2016 08:40:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 456292845E; Sat, 6 Aug 2016 08:40:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from oss.sgi.com (oss.sgi.com [192.48.182.195]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B978528418 for ; Sat, 6 Aug 2016 08:40:34 +0000 (UTC) Received: from oss.sgi.com (localhost [IPv6:::1]) by oss.sgi.com (Postfix) with ESMTP id 0F36F7CD5; Sat, 6 Aug 2016 03:40:34 -0500 (CDT) X-Original-To: xfs@oss.sgi.com Delivered-To: xfs@oss.sgi.com Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 8DF8D7CD0 for ; Sat, 6 Aug 2016 03:40:32 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay3.corp.sgi.com (Postfix) with ESMTP id 12BB2AC004 for ; Sat, 6 Aug 2016 01:40:28 -0700 (PDT) X-ASG-Debug-ID: 1470472826-0bf8157e6b510340001-NocioJ Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.66]) by cuda.sgi.com with ESMTP id Y5P4a29B5shVyksy (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Sat, 06 Aug 2016 01:40:27 -0700 (PDT) X-Barracuda-Envelope-From: felix.janda@posteo.de X-Barracuda-Effective-Source-IP: mout02.posteo.de[185.67.36.66] X-Barracuda-Apparent-Source-IP: 185.67.36.66 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id D72E92083B for ; Sat, 6 Aug 2016 10:40:25 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3s5xvY2yvvzysW for ; Sat, 6 Aug 2016 10:40:25 +0200 (CEST) Date: Sat, 6 Aug 2016 10:39:49 +0200 From: Felix Janda To: xfs@oss.sgi.com Subject: [PATCH xfsprogs] kill off u_int*_t types Message-ID: <20160806083949.GA28832@nyan> X-ASG-Orig-Subj: [PATCH xfsprogs] kill off u_int*_t types MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.1 (2016-04-27) X-Barracuda-Connect: mout02.posteo.de[185.67.36.66] X-Barracuda-Start-Time: 1470472826 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://192.48.157.11:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 1777 X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.31792 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-BeenThere: xfs@oss.sgi.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com X-Virus-Scanned: ClamAV using ClamSMTP They were only used in two places and can be replaced by uint*_t. Signed-off-by: Felix Janda --- db/check.c | 2 +- include/darwin.h | 8 ++------ libxfs/xfs_format.h | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) 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