r962: convert 'unsigned' and 'unsigned int' to uint_t

metze
(This used to be commit 57151e80eb1090281401930c8fe25b20a8cf3a38)

5 files changed, 13 insertions, 13 deletions

diff --git a/source4/include/ads.h b/source4/include/ads.h
index 410395a71b..36f898b2b0 100644
--- a/source4/include/ads.h
+++ b/source4/include/ads.h
@@ -44,7 +44,7 @@ typedef struct {
 		char *password;
 		char *user_name;
 		char *kdc_server;
-		unsigned flags;
+		uint_t flags;
 		int time_offset;
 	} auth;
 
diff --git a/source4/include/byteorder.h b/source4/include/byteorder.h
index b3caa310a4..bf68ee7df7 100644
--- a/source4/include/byteorder.h
+++ b/source4/include/byteorder.h
@@ -55,7 +55,7 @@ that don't have any int types that are 2 bytes long)
 You do this:
 
 #define CVAL(buf,pos) (((uint8_t *)(buf))[pos])
-#define PVAL(buf,pos) ((unsigned)CVAL(buf,pos))
+#define PVAL(buf,pos) ((uint_t)CVAL(buf,pos))
 #define SVAL(buf,pos) (PVAL(buf,pos)|PVAL(buf,(pos)+1)<<8)
 
 then to extract a uint16_t value at offset 25 in a buffer you do this:
@@ -105,7 +105,7 @@ it also defines lots of intermediate macros, just ignore those :-)
 #define CAREFUL_ALIGNMENT 1
 #endif
 
-#define CVAL(buf,pos) ((unsigned)(((const uint8_t *)(buf))[pos]))
+#define CVAL(buf,pos) ((uint_t)(((const uint8_t *)(buf))[pos]))
 #define CVAL_NC(buf,pos) (((uint8_t *)(buf))[pos]) /* Non-const version of CVAL */
 #define PVAL(buf,pos) (CVAL(buf,pos))
 #define SCVAL(buf,pos,val) (CVAL_NC(buf,pos) = (val))
diff --git a/source4/include/cli_context.h b/source4/include/cli_context.h
index b0e178e1d0..24dcfe7235 100644
--- a/source4/include/cli_context.h
+++ b/source4/include/cli_context.h
@@ -43,7 +43,7 @@ struct cli_negotiate {
 	/* 
 	 * negotiated maximum transmit size - this is given to us by the server
 	 */
-	unsigned max_xmit;
+	uint_t max_xmit;
 
 	/* maximum number of requests that can be multiplexed */
 	uint16_t max_mux;
@@ -85,7 +85,7 @@ struct cli_socket {
 
 	/* a count of the number of packets we have received. We
 	 * actually only care about zero/non-zero at this stage */
-	unsigned pkt_count;
+	uint_t pkt_count;
 
 	/* the network address of the client */
 	char *client_addr;
@@ -147,7 +147,7 @@ struct cli_transport {
 			} dos;
 			NTSTATUS nt_status;
 			enum socket_error socket_error;
-			unsigned nbt_error;
+			uint_t nbt_error;
 		} e;
 	} error;
 
@@ -232,7 +232,7 @@ struct cli_request {
 	NTSTATUS status;
 	
 	/* the sequence number of this packet - used for signing */
-	unsigned seq_num;
+	uint_t seq_num;
 
 	/* set if this is a one-way request, meaning we are not
 	   expecting a reply from the server. */
@@ -246,12 +246,12 @@ struct cli_request {
 		char *buffer;
 		
 		/* the size of the raw buffer, including 4 byte header */
-		unsigned size;
+		uint_t size;
 
 		/* how much has been allocated - on reply the buffer is over-allocated to 
 		   prevent too many realloc() calls 
 		*/
-		unsigned allocated;
+		uint_t allocated;
 
 		/* the start of the SMB header - this is always buffer+4 */
 		char *hdr;
@@ -259,11 +259,11 @@ struct cli_request {
 		/* the command words and command word count. vwv points
 		   into the raw buffer */
 		char *vwv;
-		unsigned wct;
+		uint_t wct;
 
 		/* the data buffer and size. data points into the raw buffer */
 		char *data;
-		unsigned data_size;
+		uint_t data_size;
 
 		/* ptr is used as a moving pointer into the data area
 		 * of the packet. The reason its here and not a local
diff --git a/source4/include/md5.h b/source4/include/md5.h
index 57c2f99caa..cd23979f8a 100644
--- a/source4/include/md5.h
+++ b/source4/include/md5.h
@@ -13,7 +13,7 @@ struct MD5Context {
 
 void MD5Init(struct MD5Context *context);
 void MD5Update(struct MD5Context *context, uint8_t const *buf,
-	       unsigned len);
+	       uint_t len);
 void MD5Final(uint8_t digest[16], struct MD5Context *context);
 
 /*
diff --git a/source4/include/smb.h b/source4/include/smb.h
index 55dd430d05..f0ddab65af 100644
--- a/source4/include/smb.h
+++ b/source4/include/smb.h
@@ -371,7 +371,7 @@ struct parm_struct
 	void *ptr;
 	BOOL (*special)(const char *, char **);
 	const struct enum_list *enum_list;
-	unsigned flags;
+	uint_t flags;
 	union {
 		BOOL bvalue;
 		int ivalue;