From fa2e9ec311b99dee2fbff5ee5fa2c743298dacad Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 1 Jun 2004 08:12:45 +0000
Subject: r960: convert 'unsigned int' to uint_t in the most places

metze
(This used to be commit 18062d2ed9fc9224c43143c10efbf2f6f1f5bbe0)
---
 source4/include/cli_context.h | 14 +++++++-------
 source4/include/nameserv.h    |  2 +-
 source4/include/registry.h    |  2 +-
 source4/include/smb.h         |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'source4/include')

diff --git a/source4/include/cli_context.h b/source4/include/cli_context.h
index 4cfdc8db91..b0e178e1d0 100644
--- a/source4/include/cli_context.h
+++ b/source4/include/cli_context.h
@@ -62,8 +62,8 @@ struct cli_negotiate {
 	
 	int server_zone;
 	time_t server_time;
-	unsigned int readbraw_supported:1;
-	unsigned int writebraw_supported:1;
+	uint_t readbraw_supported:1;
+	uint_t writebraw_supported:1;
 
 	const char *server_domain;
 };
@@ -99,9 +99,9 @@ struct cli_socket {
   client library
 */
 struct cli_options {
-	unsigned int use_oplocks:1;
-	unsigned int use_level2_oplocks:1;
-	unsigned int use_spnego:1;
+	uint_t use_oplocks:1;
+	uint_t use_level2_oplocks:1;
+	uint_t use_spnego:1;
 };
 
 /* this is the context for the client transport layer */
@@ -126,7 +126,7 @@ struct cli_transport {
 
 	/* is a readbraw pending? we need to handle that case
 	   specially on receiving packets */
-	unsigned int readbraw_pending:1;
+	uint_t readbraw_pending:1;
 	
 	/* an idle function - if this is defined then it will be
 	   called once every period milliseconds while we are waiting
@@ -236,7 +236,7 @@ struct cli_request {
 
 	/* set if this is a one-way request, meaning we are not
 	   expecting a reply from the server. */
-	unsigned int one_way_request:1;
+	uint_t one_way_request:1;
 
 	/* the mid of this packet - used to match replies */
 	uint16_t mid;
diff --git a/source4/include/nameserv.h b/source4/include/nameserv.h
index 8b0fa835b9..2fe3fae9de 100644
--- a/source4/include/nameserv.h
+++ b/source4/include/nameserv.h
@@ -311,7 +311,7 @@ typedef void (*userdata_free_fn)(struct userdata_struct *);
 struct userdata_struct {
   userdata_copy_fn copy_fn;
   userdata_free_fn free_fn;
-  unsigned int userdata_len;
+  uint_t userdata_len;
   char data[16]; /* 16 is to ensure alignment/padding on all systems */
 };
 
diff --git a/source4/include/registry.h b/source4/include/registry.h
index 478c7919ed..db1dee9b96 100644
--- a/source4/include/registry.h
+++ b/source4/include/registry.h
@@ -52,7 +52,7 @@ typedef struct reg_ops_s REG_OPS;
 //FIXME
 typedef struct ace_struct_s {
   uint8_t type, flags;
-  unsigned int perms;   /* Perhaps a better def is in order */
+  uint_t perms;   /* Perhaps a better def is in order */
   DOM_SID *trustee;
 } ACE;
 #endif
diff --git a/source4/include/smb.h b/source4/include/smb.h
index 178fab1db1..55dd430d05 100644
--- a/source4/include/smb.h
+++ b/source4/include/smb.h
@@ -383,7 +383,7 @@ struct parm_struct
 
 struct bitmap {
 	uint32_t *b;
-	unsigned int n;
+	uint_t n;
 };
 
 #define FLAG_BASIC 	0x0001 /* fundamental options */
@@ -855,7 +855,7 @@ struct bitmap {
 struct nmb_name {
 	char         name[17];
 	char         scope[64];
-	unsigned int name_type;
+	uint_t name_type;
 };
 
 
-- 
cgit