r25399: Excise uint - > uint32 (where appropriate) or unsigned int.

Jeremy.
(This used to be commit b4ee924000f4a21b16a70e08e58331d209c4d114)

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 768c9fbcabb0b4af6c9bce4d5f22ab6b194fb626..a5fe4afe6a82665c451cf029db15dd75ce724b05 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -296,7 +296,7 @@ struct vfs_ops {
                                                          void *private_data,
                                                          struct notify_event *ev),
                                         void *private_data, void *handle_p);
-               int (*chflags)(struct vfs_handle_struct *handle, const char *path, uint flags);
+               int (*chflags)(struct vfs_handle_struct *handle, const char *path, unsigned int flags);
                struct file_id (*file_id_create)(struct vfs_handle_struct *handle, SMB_DEV_T dev, SMB_INO_T inode);
 
                /* NT ACL operations. */

diff --git a/source3/modules/vfs_aixacl.c b/source3/modules/vfs_aixacl.c
index 8e0e1589574c22aaa353f6a98b8023684065bb59..a60470ffc9528537f98c91c0b7e51ff1cc95e747 100644 (file)
--- a/source3/modules/vfs_aixacl.c
+++ b/source3/modules/vfs_aixacl.c
@@ -137,7 +137,7 @@ int aixacl_sys_acl_set_file(vfs_handle_struct *handle,
                              SMB_ACL_T theacl)
 {
        struct acl *file_acl = NULL;
-       uint rc;
+       unsigned int rc;
        
        file_acl = aixacl_smb_to_aixacl(type, theacl);
        if (!file_acl)
@@ -157,7 +157,7 @@ int aixacl_sys_acl_set_fd(vfs_handle_struct *handle,
                            int fd, SMB_ACL_T theacl)
 {
        struct acl *file_acl = NULL;
-       uint rc;
+       unsigned int rc;
 
        file_acl = aixacl_smb_to_aixacl(SMB_ACL_TYPE_ACCESS, theacl);
        if (!file_acl)

diff --git a/source3/modules/vfs_aixacl_util.c b/source3/modules/vfs_aixacl_util.c
index e1a8eb6fe286a0397675d7bceb983d6dc415b7e5..b2329fe9c65c374b008116c1a8713bb9dae4b275 100644 (file)
--- a/source3/modules/vfs_aixacl_util.c
+++ b/source3/modules/vfs_aixacl_util.c
@@ -209,9 +209,9 @@ struct acl *aixacl_smb_to_aixacl(SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
        struct acl *file_acl_temp = NULL;
        struct acl_entry *acl_entry = NULL;
        struct ace_id *ace_id = NULL;
-       uint id_type;
-       uint user_id;
-       uint acl_length;
+       unsigned int id_type;
+       unsigned int user_id;
+       unsigned int acl_length;
        int     i;
  
        DEBUG(10,("Entering aixacl_smb_to_aixacl\n"));

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 3e99e52637769459a14dcbc6acd87ac3854512e4..18180bf3ef9de34b06f3b4b9c33bbad5033c0481 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -183,7 +183,7 @@ static NTSTATUS smb_full_audit_notify_watch(struct vfs_handle_struct *handle,
                                        struct notify_event *ev),
                        void *private_data, void *handle_p);
 static int smb_full_audit_chflags(vfs_handle_struct *handle,
-                           const char *path, uint flags);
+                           const char *path, unsigned int flags);
 static struct file_id smb_full_audit_file_id_create(struct vfs_handle_struct *handle,
                                                    SMB_DEV_T dev, SMB_INO_T inode);
 static size_t smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
@@ -1460,7 +1460,7 @@ static NTSTATUS smb_full_audit_notify_watch(struct vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_chflags(vfs_handle_struct *handle,
-                           const char *path, uint flags)
+                           const char *path, unsigned int flags)
 {
        int result;
 

diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index e793651cb6d057a756b9284557111d4e2d50e393..868a72cb32d0c387587dcdea2fc5dce2708696a4 100644 (file)
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -957,7 +957,7 @@ static void store_queue_struct(struct tdb_print_db *pdb, struct traverse_struct
        print_queue_struct *queue = pts->queue;
        size_t len;
        size_t i;
-       uint qcount;
+       unsigned int qcount;
 
        if (max_reported_jobs && (max_reported_jobs < pts->qcount))
                pts->qcount = max_reported_jobs;

diff --git a/source3/rpc_parse/parse_spoolss.c b/source3/rpc_parse/parse_spoolss.c
index 843046031244a24846afaee60c7b44bf208f1ea0..04e760607e8647d09d587dd4019dbf37701fed5c 100644 (file)
--- a/source3/rpc_parse/parse_spoolss.c
+++ b/source3/rpc_parse/parse_spoolss.c
@@ -2405,8 +2405,8 @@ BOOL smb_io_printer_info_3(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_3
        
        if (MARSHALLING(ps)) {
                /* Ensure the SD is 8 byte aligned in the buffer. */
-               uint start = prs_offset(ps); /* Remember the start position. */
-               uint off_val = 0;
+               uint32 start = prs_offset(ps); /* Remember the start position. */
+               uint32 off_val = 0;
 
                /* Write a dummy value. */
                if (!prs_uint32("offset", ps, depth, &off_val))