r884: convert samba4 to use [u]int32_t instead of [u]int32

metze
(This used to be commit 0e5517d937a2eb7cf707991d1c7498c1ab456095)

6 files changed, 14 insertions, 14 deletions

diff --git a/source4/libcli/raw/clikrb5.c b/source4/libcli/raw/clikrb5.c
index 1d9c02f7f4..0d4fade295 100644
--- a/source4/libcli/raw/clikrb5.c
+++ b/source4/libcli/raw/clikrb5.c
@@ -37,10 +37,10 @@
 /*
  * This function is not in the Heimdal mainline.
  */
- krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds)
+ krb5_error_code krb5_set_real_time(krb5_context context, int32_t_t seconds, int32_t_t microseconds)
 {
 	krb5_error_code ret;
-	int32_t sec, usec;
+	int32_t_t sec, usec;
 
 	ret = krb5_us_timeofday(context, &sec, &usec);
 	if (ret)
diff --git a/source4/libcli/raw/raweas.c b/source4/libcli/raw/raweas.c
index ce0368c304..f265c8281d 100644
--- a/source4/libcli/raw/raweas.c
+++ b/source4/libcli/raw/raweas.c
@@ -42,7 +42,7 @@ uint_t ea_list_size(uint_t num_eas, struct ea_struct *eas)
 void ea_put_list(char *data, uint_t num_eas, struct ea_struct *eas)
 {
 	int i;
-	uint32 ea_size;
+	uint32_t ea_size;
 
 	ea_size = ea_list_size(num_eas, eas);
 
@@ -105,7 +105,7 @@ NTSTATUS ea_pull_list(const DATA_BLOB *blob,
 		      uint_t *num_eas, struct ea_struct **eas)
 {
 	int n;
-	uint32 ea_size, ofs;
+	uint32_t ea_size, ofs;
 
 	if (blob->length < 4) {
 		return NT_STATUS_INFO_LENGTH_MISMATCH;
diff --git a/source4/libcli/raw/rawnotify.c b/source4/libcli/raw/rawnotify.c
index 7d635da0dc..1030a61704 100644
--- a/source4/libcli/raw/rawnotify.c
+++ b/source4/libcli/raw/rawnotify.c
@@ -51,7 +51,7 @@ NTSTATUS smb_raw_changenotify_recv(struct cli_request *req,
 {
 	struct smb_nttrans nt;
 	NTSTATUS status;
-	uint32 ofs, i;
+	uint32_t ofs, i;
 	struct cli_session *session = req?req->session:NULL;
 
 	status = smb_raw_nttrans_recv(req, mem_ctx, &nt);
@@ -64,7 +64,7 @@ NTSTATUS smb_raw_changenotify_recv(struct cli_request *req,
 	
 	/* count them */
 	for (ofs=0; nt.out.params.length - ofs > 12; ) {
-		uint32 next = IVAL(nt.out.params.data, ofs);
+		uint32_t next = IVAL(nt.out.params.data, ofs);
 		parms->out.num_changes++;
 		if (next == 0 ||
 		    ofs + next >= nt.out.params.length) break;
diff --git a/source4/libcli/raw/rawrequest.c b/source4/libcli/raw/rawrequest.c
index 085b445fba..d8e4d80b39 100644
--- a/source4/libcli/raw/rawrequest.c
+++ b/source4/libcli/raw/rawrequest.c
@@ -153,7 +153,7 @@ struct cli_request *cli_request_setup_session(struct cli_session *session,
 {
 	struct cli_request *req;
 	uint16 flags2;
-	uint32 capabilities;
+	uint32_t capabilities;
 
 	req = cli_request_setup_transport(session->transport, command, wct, buflen);
 
@@ -798,7 +798,7 @@ DATA_BLOB cli_req_pull_blob(struct cli_request *req, TALLOC_CTX *mem_ctx, const
 
 /* check that a lump of data in a request is within the bounds of the data section of
    the packet */
-static BOOL cli_req_data_oob(struct cli_request *req, const char *ptr, uint32 count)
+static BOOL cli_req_data_oob(struct cli_request *req, const char *ptr, uint32_t count)
 {
 	/* be careful with wraparound! */
 	if (ptr < req->in.data ||
diff --git a/source4/libcli/raw/rawtrans.c b/source4/libcli/raw/rawtrans.c
index 1fd91b29d7..d13a1227dd 100644
--- a/source4/libcli/raw/rawtrans.c
+++ b/source4/libcli/raw/rawtrans.c
@@ -320,8 +320,8 @@ NTSTATUS smb_raw_nttrans_recv(struct cli_request *req,
 			      TALLOC_CTX *mem_ctx,
 			      struct smb_nttrans *parms)
 {
-	uint32 total_data, recvd_data=0;
-	uint32 total_param, recvd_param=0;
+	uint32_t total_data, recvd_data=0;
+	uint32_t total_param, recvd_param=0;
 
 	if (!cli_request_receive(req) ||
 	    cli_request_is_error(req)) {
@@ -369,9 +369,9 @@ NTSTATUS smb_raw_nttrans_recv(struct cli_request *req,
 	
 	while (recvd_data < total_data || 
 	       recvd_param < total_param)  {
-		uint32 param_count, param_ofs, param_disp;
-		uint32 data_count, data_ofs, data_disp;
-		uint32 total_data2, total_param2;
+		uint32_t param_count, param_ofs, param_disp;
+		uint32_t data_count, data_ofs, data_disp;
+		uint32_t total_data2, total_param2;
 
 		/* parse out the total lengths again - they can shrink! */
 		total_param2 = IVAL(req->in.vwv, 3);
diff --git a/source4/libcli/raw/smb_signing.c b/source4/libcli/raw/smb_signing.c
index 5f47a5e42a..bb295ee991 100644
--- a/source4/libcli/raw/smb_signing.c
+++ b/source4/libcli/raw/smb_signing.c
@@ -24,7 +24,7 @@
 
 struct smb_basic_signing_context {
 	DATA_BLOB mac_key;
-	uint32 next_seq_num;
+	uint32_t next_seq_num;
 };
 
 /***********************************************************