Change uint_t to unsigned int in source4

Signed-off-by: Stefan Metzmacher <metze@samba.org>

13 files changed, 37 insertions, 37 deletions

diff --git a/source4/ntvfs/cifs_posix_cli/svfs_util.c b/source4/ntvfs/cifs_posix_cli/svfs_util.c
index 03a46205a7..d8a7909390 100644
--- a/source4/ntvfs/cifs_posix_cli/svfs_util.c
+++ b/source4/ntvfs/cifs_posix_cli/svfs_util.c
@@ -66,7 +66,7 @@ struct cifspsx_dir *cifspsx_list_unix(TALLOC_CTX *mem_ctx, struct ntvfs_request
 	struct cifspsx_dir *dir;
 	DIR *odir;
 	struct dirent *dent;
-	uint_t allocated = 0;
+	unsigned int allocated = 0;
 	char *low_mask;
 
 	dir = talloc(mem_ctx, struct cifspsx_dir);
@@ -93,7 +93,7 @@ struct cifspsx_dir *cifspsx_list_unix(TALLOC_CTX *mem_ctx, struct ntvfs_request
 	if (!odir) { return NULL; }
 
 	while ((dent = readdir(odir))) {
-		uint_t i = dir->count;
+		unsigned int i = dir->count;
 		char *full_name;
 		char *low_name;
 
diff --git a/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c b/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c
index 4e67b22e23..6ee6961610 100644
--- a/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c
+++ b/source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c
@@ -864,7 +864,7 @@ static NTSTATUS cifspsx_search_first(struct ntvfs_module_context *ntvfs,
 	struct cifspsx_private *p = ntvfs->private_data;
 	struct search_state *search;
 	union smb_search_data file;
-	uint_t max_count;
+	unsigned int max_count;
 
 	if (io->generic.level != RAW_SEARCH_TRANS2) {
 		return NT_STATUS_NOT_SUPPORTED;
@@ -938,7 +938,7 @@ static NTSTATUS cifspsx_search_next(struct ntvfs_module_context *ntvfs,
 	struct cifspsx_private *p = ntvfs->private_data;
 	struct search_state *search;
 	union smb_search_data file;
-	uint_t max_count;
+	unsigned int max_count;
 
 	if (io->generic.level != RAW_SEARCH_TRANS2) {
 		return NT_STATUS_NOT_SUPPORTED;
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 059145b6e5..547d038738 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -148,7 +148,7 @@ static NTSTATUS ntvfs_map_open_finish(struct ntvfs_module_context *ntvfs,
 	time_t write_time = 0;
 	uint32_t set_size = 0;
 	union smb_setfileinfo *sf;
-	uint_t state;
+	unsigned int state;
 
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
@@ -579,7 +579,7 @@ static NTSTATUS ntvfs_map_fsinfo_finish(struct ntvfs_module_context *ntvfs,
 
 	case RAW_QFS_DSKATTR: {
 		/* map from generic to DSKATTR */
-		uint_t bpunit = 64;
+		unsigned int bpunit = 64;
 
 		/* we need to scale the sizes to fit */
 		for (bpunit=64; bpunit<0x10000; bpunit *= 2) {
@@ -1187,7 +1187,7 @@ static NTSTATUS ntvfs_map_write_finish(struct ntvfs_module_context *ntvfs,
 {
 	union smb_lock *lck;
 	union smb_close *cl;
-	uint_t state;
+	unsigned int state;
 
 	if (NT_STATUS_IS_ERR(status)) {
 		return status;
@@ -1381,7 +1381,7 @@ NTSTATUS ntvfs_map_read(struct ntvfs_module_context *ntvfs,
 	union smb_read *rd2;
 	union smb_lock *lck;
 	NTSTATUS status;
-	uint_t state;
+	unsigned int state;
 
 	rd2 = talloc(req, union smb_read);
 	if (rd2 == NULL) {
diff --git a/source4/ntvfs/posix/pvfs_fileinfo.c b/source4/ntvfs/posix/pvfs_fileinfo.c
index a14c8f64ae..a372383daa 100644
--- a/source4/ntvfs/posix/pvfs_fileinfo.c
+++ b/source4/ntvfs/posix/pvfs_fileinfo.c
@@ -53,7 +53,7 @@ static uint32_t dos_mode_from_stat(struct pvfs_state *pvfs, struct stat *st)
   fill in the dos file attributes for a file
 */
 NTSTATUS pvfs_fill_dos_info(struct pvfs_state *pvfs, struct pvfs_filename *name,
-			    uint_t flags, int fd)
+			    unsigned int flags, int fd)
 {
 	NTSTATUS status;
 	DATA_BLOB lkey;
diff --git a/source4/ntvfs/posix/pvfs_fsinfo.c b/source4/ntvfs/posix/pvfs_fsinfo.c
index 10fb7cf707..210433baef 100644
--- a/source4/ntvfs/posix/pvfs_fsinfo.c
+++ b/source4/ntvfs/posix/pvfs_fsinfo.c
@@ -88,7 +88,7 @@ NTSTATUS pvfs_fsinfo(struct ntvfs_module_context *ntvfs,
 	struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data,
 				  struct pvfs_state);
 	uint64_t blocks_free, blocks_total;
-	uint_t bpunit;
+	unsigned int bpunit;
 	struct stat st;
 	const uint16_t block_size = 512;
 
diff --git a/source4/ntvfs/posix/pvfs_qfileinfo.c b/source4/ntvfs/posix/pvfs_qfileinfo.c
index b6c1d4f497..e54fc2d669 100644
--- a/source4/ntvfs/posix/pvfs_qfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_qfileinfo.c
@@ -76,7 +76,7 @@ static uint32_t pvfs_fileinfo_access(union smb_fileinfo *info)
 */
 NTSTATUS pvfs_query_ea_list(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx, 
 			    struct pvfs_filename *name, int fd, 
-			    uint_t num_names,
+			    unsigned int num_names,
 			    struct ea_name *names,
 			    struct smb_ea_list *eas)
 {
diff --git a/source4/ntvfs/posix/pvfs_resolve.c b/source4/ntvfs/posix/pvfs_resolve.c
index 8f462648bd..9613b7078a 100644
--- a/source4/ntvfs/posix/pvfs_resolve.c
+++ b/source4/ntvfs/posix/pvfs_resolve.c
@@ -59,7 +59,7 @@ static int component_compare(struct pvfs_state *pvfs, const char *comp, const ch
 */
 static NTSTATUS pvfs_case_search(struct pvfs_state *pvfs,
 				 struct pvfs_filename *name,
-				 uint_t flags)
+				 unsigned int flags)
 {
 	/* break into a series of components */
 	int num_components;
@@ -256,7 +256,7 @@ static NTSTATUS parse_stream_name(struct smb_iconv_convenience *ic,
   errors are returned if the filename is illegal given the flags
 */
 static NTSTATUS pvfs_unix_path(struct pvfs_state *pvfs, const char *cifs_name,
-			       uint_t flags, struct pvfs_filename *name)
+			       unsigned int flags, struct pvfs_filename *name)
 {
 	char *ret, *p, *p_start;
 	struct smb_iconv_convenience *ic = NULL;
@@ -389,7 +389,7 @@ static NTSTATUS pvfs_unix_path(struct pvfs_state *pvfs, const char *cifs_name,
 */
 static NTSTATUS pvfs_reduce_name(TALLOC_CTX *mem_ctx, 
 				 struct smb_iconv_convenience *iconv_convenience, 
-				 const char **fname, uint_t flags)
+				 const char **fname, unsigned int flags)
 {
 	codepoint_t c;
 	size_t c_size, len;
@@ -511,7 +511,7 @@ static NTSTATUS pvfs_reduce_name(TALLOC_CTX *mem_ctx,
 NTSTATUS pvfs_resolve_name(struct pvfs_state *pvfs, 
 			   struct ntvfs_request *req,
 			   const char *cifs_name,
-			   uint_t flags, struct pvfs_filename **name)
+			   unsigned int flags, struct pvfs_filename **name)
 {
 	NTSTATUS status;
 
@@ -610,7 +610,7 @@ NTSTATUS pvfs_resolve_name(struct pvfs_state *pvfs,
 */
 NTSTATUS pvfs_resolve_partial(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx,
 			      const char *unix_dir, const char *fname,
-			      uint_t flags, struct pvfs_filename **name)
+			      unsigned int flags, struct pvfs_filename **name)
 {
 	NTSTATUS status;
 
@@ -647,7 +647,7 @@ NTSTATUS pvfs_resolve_partial(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx,
   to update the pvfs_filename stat information, and by pvfs_open()
 */
 NTSTATUS pvfs_resolve_name_fd(struct pvfs_state *pvfs, int fd,
-			      struct pvfs_filename *name, uint_t flags)
+			      struct pvfs_filename *name, unsigned int flags)
 {
 	dev_t device = (dev_t)0;
 	ino_t inode = 0;
diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c
index d0d2620648..e6b53ee623 100644
--- a/source4/ntvfs/posix/pvfs_search.c
+++ b/source4/ntvfs/posix/pvfs_search.c
@@ -232,10 +232,10 @@ static NTSTATUS fill_search_info(struct pvfs_state *pvfs,
   the search fill loop
 */
 static NTSTATUS pvfs_search_fill(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx, 
-				 uint_t max_count, 
+				 unsigned int max_count,
 				 struct pvfs_search_state *search,
 				 enum smb_search_data_level level,
-				 uint_t *reply_count,
+				 unsigned int *reply_count,
 				 void *search_private, 
 				 bool (*callback)(void *, const union smb_search_data *))
 {
@@ -323,7 +323,7 @@ static NTSTATUS pvfs_search_first_old(struct ntvfs_module_context *ntvfs,
 	struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data,
 				  struct pvfs_state);
 	struct pvfs_search_state *search;
-	uint_t reply_count;
+	unsigned int reply_count;
 	uint16_t search_attrib;
 	const char *pattern;
 	NTSTATUS status;
@@ -415,7 +415,7 @@ static NTSTATUS pvfs_search_next_old(struct ntvfs_module_context *ntvfs,
 	void *p;
 	struct pvfs_search_state *search;
 	struct pvfs_dir *dir;
-	uint_t reply_count, max_count;
+	unsigned int reply_count, max_count;
 	uint16_t handle;
 	NTSTATUS status;
 
@@ -467,7 +467,7 @@ static NTSTATUS pvfs_search_first_trans2(struct ntvfs_module_context *ntvfs,
 	struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data,
 				  struct pvfs_state);
 	struct pvfs_search_state *search;
-	uint_t reply_count;
+	unsigned int reply_count;
 	uint16_t search_attrib, max_count;
 	const char *pattern;
 	NTSTATUS status;
@@ -565,7 +565,7 @@ static NTSTATUS pvfs_search_next_trans2(struct ntvfs_module_context *ntvfs,
 	void *p;
 	struct pvfs_search_state *search;
 	struct pvfs_dir *dir;
-	uint_t reply_count;
+	unsigned int reply_count;
 	uint16_t handle;
 	NTSTATUS status;
 
@@ -629,7 +629,7 @@ static NTSTATUS pvfs_search_first_smb2(struct ntvfs_module_context *ntvfs,
 	struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data,
 				  struct pvfs_state);
 	struct pvfs_search_state *search;
-	uint_t reply_count;
+	unsigned int reply_count;
 	uint16_t max_count;
 	const char *pattern;
 	NTSTATUS status;
@@ -732,7 +732,7 @@ static NTSTATUS pvfs_search_next_smb2(struct ntvfs_module_context *ntvfs,
 	struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data,
 				  struct pvfs_state);
 	struct pvfs_search_state *search;
-	uint_t reply_count;
+	unsigned int reply_count;
 	uint16_t max_count;
 	NTSTATUS status;
 	struct pvfs_file *f;
diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h
index 7341d0d9ca..6354f7558f 100644
--- a/source4/ntvfs/posix/vfs_posix.h
+++ b/source4/ntvfs/posix/vfs_posix.h
@@ -40,7 +40,7 @@ struct pvfs_state {
 	struct GUID *base_fs_uuid;
 
 	const char *share_name;
-	uint_t flags;
+	unsigned int flags;
 
 	struct pvfs_mangle_context *mangle_ctx;
 
@@ -54,13 +54,13 @@ struct pvfs_state {
 	struct pvfs_wait *wait_list;
 
 	/* the sharing violation timeout (nsecs) */
-	uint_t sharing_violation_delay;
+	unsigned int sharing_violation_delay;
 
 	/* the oplock break timeout (secs) */
-	uint_t oplock_break_timeout;
+	unsigned int oplock_break_timeout;
 
 	/* the write time update delay (nsecs) */
-	uint_t writetime_delay;
+	unsigned int writetime_delay;
 
 	/* filesystem attributes (see FS_ATTR_*) */
 	uint32_t fs_attribs;
@@ -84,7 +84,7 @@ struct pvfs_state {
 		struct pvfs_search_state *list;
 
 		/* how long to keep inactive searches around for */
-		uint_t inactivity_time;
+		unsigned int inactivity_time;
 	} search;
 
 	/* used to accelerate acl mapping */
@@ -223,7 +223,7 @@ struct pvfs_search_state {
 	uint16_t must_attrib;
 	struct pvfs_dir *dir;
 	time_t last_used;
-	uint_t num_ea_names;
+	unsigned int num_ea_names;
 	struct ea_name *ea_names;
 	struct tevent_timer *te;
 };
diff --git a/source4/ntvfs/simple/svfs_util.c b/source4/ntvfs/simple/svfs_util.c
index f7f011572a..70ba340727 100644
--- a/source4/ntvfs/simple/svfs_util.c
+++ b/source4/ntvfs/simple/svfs_util.c
@@ -63,7 +63,7 @@ struct svfs_dir *svfs_list_unix(TALLOC_CTX *mem_ctx, struct ntvfs_request *req,
 	struct svfs_dir *dir;
 	DIR *odir;
 	struct dirent *dent;
-	uint_t allocated = 0;
+	unsigned int allocated = 0;
 	char *low_mask;
 
 	dir = talloc(mem_ctx, struct svfs_dir);
@@ -90,7 +90,7 @@ struct svfs_dir *svfs_list_unix(TALLOC_CTX *mem_ctx, struct ntvfs_request *req,
 	if (!odir) { return NULL; }
 
 	while ((dent = readdir(odir))) {
-		uint_t i = dir->count;
+		unsigned int i = dir->count;
 		char *full_name;
 		char *low_name;
 
diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c
index 9577e8673a..6dbd6f0352 100644
--- a/source4/ntvfs/simple/vfs_simple.c
+++ b/source4/ntvfs/simple/vfs_simple.c
@@ -861,7 +861,7 @@ static NTSTATUS svfs_search_first(struct ntvfs_module_context *ntvfs,
 	struct svfs_private *p = ntvfs->private_data;
 	struct search_state *search;
 	union smb_search_data file;
-	uint_t max_count;
+	unsigned int max_count;
 
 	if (io->generic.level != RAW_SEARCH_TRANS2) {
 		return NT_STATUS_NOT_SUPPORTED;
@@ -935,7 +935,7 @@ static NTSTATUS svfs_search_next(struct ntvfs_module_context *ntvfs,
 	struct svfs_private *p = ntvfs->private_data;
 	struct search_state *search;
 	union smb_search_data file;
-	uint_t max_count;
+	unsigned int max_count;
 
 	if (io->generic.level != RAW_SEARCH_TRANS2) {
 		return NT_STATUS_NOT_SUPPORTED;
diff --git a/source4/ntvfs/smb2/vfs_smb2.c b/source4/ntvfs/smb2/vfs_smb2.c
index ff02eed994..e279b5ab49 100644
--- a/source4/ntvfs/smb2/vfs_smb2.c
+++ b/source4/ntvfs/smb2/vfs_smb2.c
@@ -721,7 +721,7 @@ static NTSTATUS cvfs_search_first(struct ntvfs_module_context *ntvfs,
 	struct cvfs_private *p = ntvfs->private_data;
 	struct smb2_find f;
 	enum smb_search_data_level smb2_level;
-	uint_t count, i;
+	unsigned int count, i;
 	union smb_search_data *data;
 	NTSTATUS status;
 
diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c
index 70ad6ee253..8102c99536 100644
--- a/source4/ntvfs/unixuid/vfs_unixuid.c
+++ b/source4/ntvfs/unixuid/vfs_unixuid.c
@@ -40,7 +40,7 @@ struct unixuid_private {
 struct unix_sec_ctx {
 	uid_t uid;
 	gid_t gid;
-	uint_t ngroups;
+	unsigned int ngroups;
 	gid_t *groups;
 };