Convert uint32/16/8 to _t for the last two include files in source3/include.

There are still many files to touch before we can remove the #define but this
gets the last include files in source3/includes.

Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-by: Jeremy Allson <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri May  1 21:52:25 CEST 2015 on sn-devel-104

diff --git a/source3/include/ntioctl.h b/source3/include/ntioctl.h
index 65bed645b5ccac219c5b0d915e612937221a7ff8..f9e6dd996a74cd94c247f6688012a45a82be810f 100644 (file)
--- a/source3/include/ntioctl.h
+++ b/source3/include/ntioctl.h
@@ -34,7 +34,7 @@ typedef char SHADOW_COPY_LABEL[25];
 
 struct shadow_copy_data {
        /* Total number of shadow volumes currently mounted */
-       uint32 num_volumes;
+       uint32_t num_volumes;
        /* Concatenated list of labels */
        SHADOW_COPY_LABEL *labels;
 };

diff --git a/source3/include/ntquotas.h b/source3/include/ntquotas.h
index cd460260dadcd207fc399cf7be6d0b63cfef275b..d8a0dc3424b3db0703bcfe566e0ceed13b05284e 100644 (file)
--- a/source3/include/ntquotas.h
+++ b/source3/include/ntquotas.h
@@ -71,7 +71,7 @@ typedef struct _SMB_NTQUOTA_STRUCT {
        uint64_t usedspace;
        uint64_t softlim;
        uint64_t hardlim;
-       uint32 qflags;
+       uint32_t qflags;
        struct dom_sid sid;
 } SMB_NTQUOTA_STRUCT;
 

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 7d2a0e5cd28768cd7ca0a5906720eb1897c3c25b..9b434a0dfd59f79f16299c4ed4c12216f0236692 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -371,7 +371,7 @@ static NTSTATUS vfswrap_snap_delete(struct vfs_handle_struct *handle,
 
 /* Directory operations */
 
-static DIR *vfswrap_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)
+static DIR *vfswrap_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32_t attr)
 {
        DIR *result;
 
@@ -384,7 +384,7 @@ static DIR *vfswrap_opendir(vfs_handle_struct *handle, const char *fname, const
 static DIR *vfswrap_fdopendir(vfs_handle_struct *handle,
                        files_struct *fsp,
                        const char *mask,
-                       uint32 attr)
+                       uint32_t attr)
 {
        DIR *result;
 
@@ -1141,8 +1141,8 @@ static NTSTATUS vfswrap_fsctl(struct vfs_handle_struct *handle,
                 */
                struct shadow_copy_data *shadow_data = NULL;
                bool labels = False;
-               uint32 labels_data_count = 0;
-               uint32 i;
+               uint32_t labels_data_count = 0;
+               uint32_t i;
                char *cur_pdata = NULL;
 
                if (max_out_len < 16) {
@@ -2029,7 +2029,7 @@ static bool vfswrap_lock(vfs_handle_struct *handle, files_struct *fsp, int op, o
 }
 
 static int vfswrap_kernel_flock(vfs_handle_struct *handle, files_struct *fsp,
-                               uint32 share_mode, uint32 access_mask)
+                               uint32_t share_mode, uint32_t access_mask)
 {
        START_PROFILE(syscall_kernel_flock);
        kernel_flock(fsp->fh->fd, share_mode, access_mask);
@@ -2334,7 +2334,7 @@ static void vfswrap_strict_unlock(struct vfs_handle_struct *handle,
 
 static NTSTATUS vfswrap_fget_nt_acl(vfs_handle_struct *handle,
                                    files_struct *fsp,
-                                   uint32 security_info,
+                                   uint32_t security_info,
                                    TALLOC_CTX *mem_ctx,
                                    struct security_descriptor **ppdesc)
 {
@@ -2349,7 +2349,7 @@ static NTSTATUS vfswrap_fget_nt_acl(vfs_handle_struct *handle,
 
 static NTSTATUS vfswrap_get_nt_acl(vfs_handle_struct *handle,
                                   const char *name,
-                                  uint32 security_info,
+                                  uint32_t security_info,
                                   TALLOC_CTX *mem_ctx,
                                   struct security_descriptor **ppdesc)
 {
@@ -2362,7 +2362,7 @@ static NTSTATUS vfswrap_get_nt_acl(vfs_handle_struct *handle,
        return result;
 }
 
-static NTSTATUS vfswrap_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32 security_info_sent, const struct security_descriptor *psd)
+static NTSTATUS vfswrap_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, uint32_t security_info_sent, const struct security_descriptor *psd)
 {
        NTSTATUS result;
 

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index c8cef605b31a237ff1e337ca96054b9899fc315a..c6648d15fb3722c7720d551103262ae19d838471 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -778,7 +778,7 @@ static NTSTATUS smb_full_audit_snap_delete(struct vfs_handle_struct *handle,
 }
 
 static DIR *smb_full_audit_opendir(vfs_handle_struct *handle,
-                         const char *fname, const char *mask, uint32 attr)
+                         const char *fname, const char *mask, uint32_t attr)
 {
        DIR *result;
 
@@ -790,7 +790,7 @@ static DIR *smb_full_audit_opendir(vfs_handle_struct *handle,
 }
 
 static DIR *smb_full_audit_fdopendir(vfs_handle_struct *handle,
-                         files_struct *fsp, const char *mask, uint32 attr)
+                         files_struct *fsp, const char *mask, uint32_t attr)
 {
        DIR *result;
 
@@ -1531,7 +1531,7 @@ static bool smb_full_audit_lock(vfs_handle_struct *handle, files_struct *fsp,
 
 static int smb_full_audit_kernel_flock(struct vfs_handle_struct *handle,
                                       struct files_struct *fsp,
-                                      uint32 share_mode, uint32 access_mask)
+                                      uint32_t share_mode, uint32_t access_mask)
 {
        int result;
 
@@ -1904,7 +1904,7 @@ static NTSTATUS smb_full_audit_readdir_attr(struct vfs_handle_struct *handle,
 }
 
 static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                                          uint32 security_info,
+                                          uint32_t security_info,
                                           TALLOC_CTX *mem_ctx,
                                           struct security_descriptor **ppdesc)
 {
@@ -1921,7 +1921,7 @@ static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_stru
 
 static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle,
                                          const char *name,
-                                         uint32 security_info,
+                                         uint32_t security_info,
                                          TALLOC_CTX *mem_ctx,
                                          struct security_descriptor **ppdesc)
 {
@@ -1937,7 +1937,7 @@ static NTSTATUS smb_full_audit_get_nt_acl(vfs_handle_struct *handle,
 }
 
 static NTSTATUS smb_full_audit_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
-                             uint32 security_info_sent,
+                             uint32_t security_info_sent,
                              const struct security_descriptor *psd)
 {
        struct vfs_full_audit_private_data *pd;

diff --git a/source3/modules/vfs_shadow_copy.c b/source3/modules/vfs_shadow_copy.c
index 7b45c2e7aa6b1f4a0d65f932ccbd46efbbbf51fc..5c05e254a03be5e709cdb6eea1d16a46f4c4733b 100644 (file)
--- a/source3/modules/vfs_shadow_copy.c
+++ b/source3/modules/vfs_shadow_copy.c
@@ -73,7 +73,7 @@ static bool shadow_copy_match_name(const char *name)
        return False;
 }
 
-static DIR *shadow_copy_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr)
+static DIR *shadow_copy_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32_t attr)
 {
        shadow_copy_Dir *dirp;
        DIR *p = SMB_VFS_NEXT_OPENDIR(handle,fname,mask,attr);
@@ -120,7 +120,7 @@ static DIR *shadow_copy_opendir(vfs_handle_struct *handle, const char *fname, co
        return((DIR *)dirp);
 }
 
-static DIR *shadow_copy_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)
+static DIR *shadow_copy_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32_t attr)
 {
        shadow_copy_Dir *dirp;
        DIR *p = SMB_VFS_NEXT_FDOPENDIR(handle,fsp,mask,attr);

diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c
index eebd8cec033526f452ee9ab6f0f7e76194f356a6..5c43d7ca7a3e150bd08074151b69fb62945bd79c 100644 (file)
--- a/source3/modules/vfs_time_audit.c
+++ b/source3/modules/vfs_time_audit.c
@@ -348,7 +348,7 @@ static NTSTATUS smb_time_audit_snap_delete(struct vfs_handle_struct *handle,
 
 static DIR *smb_time_audit_opendir(vfs_handle_struct *handle,
                                   const char *fname,
-                                  const char *mask, uint32 attr)
+                                  const char *mask, uint32_t attr)
 {
        DIR *result;
        struct timespec ts1,ts2;
@@ -368,7 +368,7 @@ static DIR *smb_time_audit_opendir(vfs_handle_struct *handle,
 
 static DIR *smb_time_audit_fdopendir(vfs_handle_struct *handle,
                                              files_struct *fsp,
-                                             const char *mask, uint32 attr)
+                                             const char *mask, uint32_t attr)
 {
        DIR *result;
        struct timespec ts1,ts2;
@@ -1326,7 +1326,7 @@ static bool smb_time_audit_lock(vfs_handle_struct *handle, files_struct *fsp,
 
 static int smb_time_audit_kernel_flock(struct vfs_handle_struct *handle,
                                       struct files_struct *fsp,
-                                      uint32 share_mode, uint32 access_mask)
+                                      uint32_t share_mode, uint32_t access_mask)
 {
        int result;
        struct timespec ts1,ts2;
@@ -1901,7 +1901,7 @@ static NTSTATUS smb_time_audit_readdir_attr(struct vfs_handle_struct *handle,
 
 static NTSTATUS smb_time_audit_fget_nt_acl(vfs_handle_struct *handle,
                                           files_struct *fsp,
-                                          uint32 security_info,
+                                          uint32_t security_info,
                                           TALLOC_CTX *mem_ctx,
                                           struct security_descriptor **ppdesc)
 {
@@ -1924,7 +1924,7 @@ static NTSTATUS smb_time_audit_fget_nt_acl(vfs_handle_struct *handle,
 
 static NTSTATUS smb_time_audit_get_nt_acl(vfs_handle_struct *handle,
                                          const char *name,
-                                         uint32 security_info,
+                                         uint32_t security_info,
                                          TALLOC_CTX *mem_ctx,
                                          struct security_descriptor **ppdesc)
 {
@@ -1947,7 +1947,7 @@ static NTSTATUS smb_time_audit_get_nt_acl(vfs_handle_struct *handle,
 
 static NTSTATUS smb_time_audit_fset_nt_acl(vfs_handle_struct *handle,
                                           files_struct *fsp,
-                                          uint32 security_info_sent,
+                                          uint32_t security_info_sent,
                                           const struct security_descriptor *psd)
 {
        NTSTATUS result;