r15191: Avoid uint_t as it's not standard.

(This used to be commit 7af59357b94e3819415b3a9257be0ced745ce130)

7 files changed, 16 insertions, 16 deletions

diff --git a/source4/libcli/raw/raweas.c b/source4/libcli/raw/raweas.c
index 4c609aa593..26b04838d6 100644
--- a/source4/libcli/raw/raweas.c
+++ b/source4/libcli/raw/raweas.c
@@ -26,7 +26,7 @@
   This assumes the names are strict ascii, which should be a
   reasonable assumption
 */
-uint_t ea_list_size(uint_t num_eas, struct ea_struct *eas)
+size_t ea_list_size(uint_t num_eas, struct ea_struct *eas)
 {
 	uint_t total = 4;
 	int i;
@@ -54,7 +54,7 @@ static uint_t ea_name_list_size(uint_t num_names, struct ea_name *eas)
   This assumes the names are strict ascii, which should be a
   reasonable assumption
 */
-uint_t ea_list_size_chained(uint_t num_eas, struct ea_struct *eas)
+size_t ea_list_size_chained(uint_t num_eas, struct ea_struct *eas)
 {
 	uint_t total = 0;
 	int i;
diff --git a/source4/libcli/raw/rawnotify.c b/source4/libcli/raw/rawnotify.c
index 8ae5098c01..f4d4164016 100644
--- a/source4/libcli/raw/rawnotify.c
+++ b/source4/libcli/raw/rawnotify.c
@@ -96,7 +96,7 @@ NTSTATUS smb_raw_changenotify_recv(struct smbcli_request *req,
   we need to do find out to what request the reply belongs
 ****************************************************************************/
 struct smbcli_request *smbcli_handle_ntcancel_reply(struct smbcli_request *req,
-						    uint_t len, const uint8_t *hdr)
+						    size_t len, const uint8_t *hdr)
 {
 	struct smbcli_request *ntcancel;
 
diff --git a/source4/libcli/raw/rawrequest.c b/source4/libcli/raw/rawrequest.c
index 24390cd9e7..f042c7b581 100644
--- a/source4/libcli/raw/rawrequest.c
+++ b/source4/libcli/raw/rawrequest.c
@@ -64,7 +64,7 @@ NTSTATUS smbcli_request_destroy(struct smbcli_request *req)
   low-level function to setup a request buffer for a non-SMB packet 
   at the transport level
 */
-struct smbcli_request *smbcli_request_setup_nonsmb(struct smbcli_transport *transport, uint_t size)
+struct smbcli_request *smbcli_request_setup_nonsmb(struct smbcli_transport *transport, size_t size)
 {
 	struct smbcli_request *req;
 
@@ -147,7 +147,7 @@ struct smbcli_request *smbcli_request_setup_transport(struct smbcli_transport *t
   way. This interface is used before a session is setup.
 */
 struct smbcli_request *smbcli_request_setup_session(struct smbcli_session *session,
-						    uint8_t command, uint_t wct, uint_t buflen)
+						    uint8_t command, uint_t wct, size_t buflen)
 {
 	struct smbcli_request *req;
 
@@ -254,7 +254,7 @@ static void smbcli_req_grow_data(struct smbcli_request *req, uint_t new_size)
 */
 NTSTATUS smbcli_chained_request_setup(struct smbcli_request *req,
 				      uint8_t command, 
-				      uint_t wct, uint_t buflen)
+				      uint_t wct, size_t buflen)
 {
 	uint_t new_size = 1 + (wct*2) + 2 + buflen;
 
diff --git a/source4/libcli/raw/request.h b/source4/libcli/raw/request.h
index 4a569cfe66..fedebf4c8d 100644
--- a/source4/libcli/raw/request.h
+++ b/source4/libcli/raw/request.h
@@ -32,12 +32,12 @@ struct request_buffer {
 	uint8_t *buffer;
 	
 	/* the size of the raw buffer, including 4 byte header */
-	uint_t size;
+	size_t size;
 	
 	/* how much has been allocated - on reply the buffer is over-allocated to 
 	   prevent too many realloc() calls 
 	*/
-	uint_t allocated;
+	size_t allocated;
 	
 	/* the start of the SMB header - this is always buffer+4 */
 	uint8_t *hdr;
@@ -45,11 +45,11 @@ struct request_buffer {
 	/* the command words and command word count. vwv points
 	   into the raw buffer */
 	uint8_t *vwv;
-	uint_t wct;
+	size_t wct;
 	
 	/* the data buffer and size. data points into the raw buffer */
 	uint8_t *data;
-	uint_t data_size;
+	size_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/libcli/raw/smb_signing.c b/source4/libcli/raw/smb_signing.c
index a73db78f7b..541fd1fb8c 100644
--- a/source4/libcli/raw/smb_signing.c
+++ b/source4/libcli/raw/smb_signing.c
@@ -101,7 +101,7 @@ BOOL signing_good(struct smb_signing_context *sign_info,
 	return True;
 }
 
-void sign_outgoing_message(struct request_buffer *out, DATA_BLOB *mac_key, uint_t seq_num) 
+void sign_outgoing_message(struct request_buffer *out, DATA_BLOB *mac_key, unsigned int seq_num) 
 {
 	uint8_t calc_md5_mac[16];
 	struct MD5Context md5_ctx;
diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c
index 1f3e2f54e4..2476270d49 100644
--- a/source4/libcli/smb2/request.c
+++ b/source4/libcli/smb2/request.c
@@ -168,7 +168,7 @@ BOOL smb2_request_is_ok(struct smb2_request *req)
 /*
   check if a range in the reply body is out of bounds
 */
-BOOL smb2_oob(struct smb2_request_buffer *buf, const uint8_t *ptr, uint_t size)
+BOOL smb2_oob(struct smb2_request_buffer *buf, const uint8_t *ptr, size_t size)
 {
 	/* be careful with wraparound! */
 	if (ptr < buf->body ||
diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index ceafacf9d4..33df4daabe 100644
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/libcli/smb2/smb2.h
@@ -75,19 +75,19 @@ struct smb2_request_buffer {
 	uint8_t *buffer;
 	
 	/* the size of the raw buffer, including 4 byte header */
-	uint_t size;
+	size_t size;
 	
 	/* how much has been allocated - on reply the buffer is over-allocated to 
 	   prevent too many realloc() calls 
 	*/
-	uint_t allocated;
+	size_t allocated;
 	
 	/* the start of the SMB2 header - this is always buffer+4 */
 	uint8_t *hdr;
 	
 	/* the packet body */
 	uint8_t *body;
-	uint_t body_size;
+	size_t body_size;
 
 	/* this point to the next dynamic byte that can be used
 	 * this will be moved when some dynamic data is pushed
@@ -183,7 +183,7 @@ struct smb2_request {
   check that a body has the expected size
 */
 #define SMB2_CHECK_PACKET_RECV(req, size, dynamic) do { \
-	uint_t is_size = req->in.body_size; \
+	size_t is_size = req->in.body_size; \
 	uint16_t field_size = SVAL(req->in.body, 0); \
 	uint16_t want_size = ((dynamic)?(size)+1:(size)); \
 	if (is_size < (size)) { \