Convert all uint8/16/32 to _t in all modules.

Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

1 files changed, 12 insertions, 12 deletions

diff --git a/source3/modules/nfs4_acls.h b/source3/modules/nfs4_acls.h
index 68abebf8e48..19220106ec3 100644
--- a/source3/modules/nfs4_acls.h
+++ b/source3/modules/nfs4_acls.h
@@ -31,9 +31,9 @@
  * used in the NFS4 ACL structures. 
  */
 typedef union _SMB_NFS4_ACEWHOID_T {
-	uid_t	uid;	/* User id */
-	gid_t	gid;	/* Group id */
-	uint32	special_id;	/* Identifies special identities in NFS4 */
+	uid_t		uid;	/* User id */
+	gid_t		gid;	/* Group id */
+	uint32_t	special_id; /* Identifies special identities in NFS4 */
 
 #define SMB_ACE4_WHO_OWNER         0x00000001 /*The owner of the file. */
 #define SMB_ACE4_WHO_GROUP         0x00000002 /*The group associated with the file. */
@@ -46,11 +46,11 @@ typedef union _SMB_NFS4_ACEWHOID_T {
 #define SMB_ACE4_WHO_AUTHENTICATED 0x00000009 /*Any authenticated user (opposite of ANONYMOUS) */
 #define SMB_ACE4_WHO_SERVICE       0x0000000A /*Access from a system service. */
 #define SMB_ACE4_WHO_MAX		SMB_ACE4_WHO_SERVICE  /* largest valid ACE4_WHO */
-	uint32 id;
+	uint32_t id;
 } SMB_NFS4_ACEWHOID_T;
 
 typedef struct _SMB_ACE4PROP_T { 
-	uint32	flags;	/* Bit mask defining details of ACE */
+	uint32_t flags;		/* Bit mask defining details of ACE */
 /*The following are constants for flags field */
 /* #define	SMB_ACE4_ID_NOT_VALID	0x00000001 - from aix/jfs2 */
 #define	SMB_ACE4_ID_SPECIAL		0x00000002
@@ -59,7 +59,7 @@ typedef struct _SMB_ACE4PROP_T {
 
 	/* The following part of ACE has the same layout as NFSv4 wire format. */
 
-	uint32	aceType;	/* Type of ACE PERMIT/ALLOW etc*/
+	uint32_t aceType;	/* Type of ACE PERMIT/ALLOW etc*/
 /*The constants used for the type field (acetype4) are as follows: */
 #define	SMB_ACE4_ACCESS_ALLOWED_ACE_TYPE	0x00000000
 #define	SMB_ACE4_ACCESS_DENIED_ACE_TYPE	0x00000001
@@ -67,7 +67,7 @@ typedef struct _SMB_ACE4PROP_T {
 #define	SMB_ACE4_SYSTEM_ALARM_ACE_TYPE	0x00000003
 #define SMB_ACE4_MAX_TYPE	ACE4_SYSTEM_ALARM_ACE_TYPE  /* largest valid ACE4_TYPE */
 
-	uint32	aceFlags;	/* Controls Inheritance and such */
+	uint32_t aceFlags;	/* Controls Inheritance and such */
 /*The bitmask constants used for the flag field are as follows: */
 #define SMB_ACE4_FILE_INHERIT_ACE             0x00000001
 #define SMB_ACE4_DIRECTORY_INHERIT_ACE        0x00000002
@@ -81,7 +81,7 @@ typedef struct _SMB_ACE4PROP_T {
 | SMB_ACE4_NO_PROPAGATE_INHERIT_ACE | SMB_ACE4_INHERIT_ONLY_ACE | SMB_ACE4_SUCCESSFUL_ACCESS_ACE_FLAG \
 | SMB_ACE4_FAILED_ACCESS_ACE_FLAG | SMB_ACE4_IDENTIFIER_GROUP | SMB_ACE4_INHERITED_ACE)
 
-	uint32	aceMask;	/* Access rights */
+	uint32_t aceMask;	/* Access rights */
 /*The bitmask constants used for the access mask field are as follows: */
 #define SMB_ACE4_READ_DATA            0x00000001
 #define SMB_ACE4_LIST_DIRECTORY       0x00000001
@@ -128,20 +128,20 @@ SMB4ACE_T *smb_first_ace4(SMB4ACL_T *theacl);
 /* Returns NULL in the end - or error */
 SMB4ACE_T *smb_next_ace4(SMB4ACE_T *ace);
 
-uint32 smb_get_naces(SMB4ACL_T *theacl);
+uint32_t smb_get_naces(SMB4ACL_T *theacl);
 
 uint16_t smbacl4_get_controlflags(SMB4ACL_T *theacl);
 
 bool smbacl4_set_controlflags(SMB4ACL_T *theacl, uint16_t controlflags);
 
 NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
-	uint32 security_info,
+	uint32_t security_info,
 	TALLOC_CTX *mem_ctx,
 	struct security_descriptor **ppdesc, SMB4ACL_T *theacl);
 
 NTSTATUS smb_get_nt_acl_nfs4(connection_struct *conn,
 	const char *name,
-	uint32 security_info,
+	uint32_t security_info,
 	TALLOC_CTX *mem_ctx,
 	struct security_descriptor **ppdesc, SMB4ACL_T *theacl);
 
@@ -150,7 +150,7 @@ NTSTATUS smb_get_nt_acl_nfs4(connection_struct *conn,
 typedef bool (*set_nfs4acl_native_fn_t)(vfs_handle_struct *handle, files_struct *, SMB4ACL_T *);
 
 NTSTATUS smb_set_nt_acl_nfs4(vfs_handle_struct *handle, files_struct *fsp,
-	uint32 security_info_sent,
+	uint32_t security_info_sent,
 	const struct security_descriptor *psd,
 	set_nfs4acl_native_fn_t set_nfs4_native);