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

metze
(This used to be commit 0e5517d937a2eb7cf707991d1c7498c1ab456095)

6 files changed, 15 insertions, 15 deletions

diff --git a/source4/smb_server/connection.c b/source4/smb_server/connection.c
index 35f5138956..77c04187ce 100644
--- a/source4/smb_server/connection.c
+++ b/source4/smb_server/connection.c
@@ -104,7 +104,7 @@ static int count_fn( TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DATA dbuf, void *u
  Claim an entry in the connections database.
 ****************************************************************************/
 
-BOOL claim_connection(struct tcon_context *conn, const char *name,int max_connections,BOOL Clear, uint32 msg_flags)
+BOOL claim_connection(struct tcon_context *conn, const char *name,int max_connections,BOOL Clear, uint32_t msg_flags)
 {
 	struct connections_key key;
 	struct connections_data crec;
@@ -180,7 +180,7 @@ BOOL claim_connection(struct tcon_context *conn, const char *name,int max_connec
 	return True;
 }
 
-BOOL register_message_flags(BOOL doreg, uint32 msg_flags)
+BOOL register_message_flags(BOOL doreg, uint32_t msg_flags)
 {
 	struct connections_key key;
 	struct connections_data *pcrec;
diff --git a/source4/smb_server/nttrans.c b/source4/smb_server/nttrans.c
index 13afdeeea2..2847efcef5 100644
--- a/source4/smb_server/nttrans.c
+++ b/source4/smb_server/nttrans.c
@@ -67,7 +67,7 @@ static NTSTATUS nttrans_ioctl(struct request_context *req,
 		struct smb_nttrans *trans)
 {
 	union smb_ioctl nt;
-	uint32 function;
+	uint32_t function;
 	uint16 fnum;
 	uint8 filter;
 	BOOL fsctl;
diff --git a/source4/smb_server/reply.c b/source4/smb_server/reply.c
index eab71c519c..5680618bd3 100644
--- a/source4/smb_server/reply.c
+++ b/source4/smb_server/reply.c
@@ -671,7 +671,7 @@ void reply_readbraw(struct request_context *req)
 
 	/* the 64 bit varient */
 	if (req->in.wct == 10) {
-		uint32 offset_high = IVAL(req->in.vwv, VWV(8));
+		uint32_t offset_high = IVAL(req->in.vwv, VWV(8));
 		io.readbraw.in.offset |= (((SMB_OFF_T)offset_high) << 32);
 	}
 
@@ -877,7 +877,7 @@ void reply_read_and_X(struct request_context *req)
 	
 	/* the 64 bit varient */
 	if (req->in.wct == 12) {
-		uint32 offset_high = IVAL(req->in.vwv, VWV(10));
+		uint32_t offset_high = IVAL(req->in.vwv, VWV(10));
 		io->readx.in.offset |= (((uint64_t)offset_high) << 32);
 	}
 
@@ -1064,10 +1064,10 @@ void reply_write_and_X(struct request_context *req)
 	io->writex.in.data      = req->in.hdr + SVAL(req->in.vwv, VWV(11));
 
 	if (req->in.wct == 14) {
-		uint32 offset_high = IVAL(req->in.vwv, VWV(12));
+		uint32_t offset_high = IVAL(req->in.vwv, VWV(12));
 		uint16 count_high = SVAL(req->in.vwv, VWV(9));
 		io->writex.in.offset |= (((uint64_t)offset_high) << 32);
-		io->writex.in.count |= ((uint32)count_high) << 16;
+		io->writex.in.count |= ((uint32_t)count_high) << 16;
 	}
 
 	/* make sure the data is in bounds */
@@ -1754,7 +1754,7 @@ void reply_lockingX(struct request_context *req)
 
 	/* construct the locks array */
 	for (i=0;i<total_locks;i++) {
-		uint32 ofs_high=0, count_high=0;
+		uint32_t ofs_high=0, count_high=0;
 
 		lck->lockx.in.locks[i].pid = SVAL(p, 0);
 
diff --git a/source4/smb_server/request.c b/source4/smb_server/request.c
index 5c1d14a9d0..068e43cd09 100644
--- a/source4/smb_server/request.c
+++ b/source4/smb_server/request.c
@@ -81,7 +81,7 @@ struct request_context *init_smb_request(struct server_context *smb)
 */
 static void req_setup_chain_reply(struct request_context *req, unsigned wct, unsigned buflen)
 {
-	uint32 chain_base_size = req->out.size;
+	uint32_t chain_base_size = req->out.size;
 
 	/* we need room for the wct value, the words, the buffer length and the buffer */
 	req->out.size += 1 + VWV(wct) + 2 + buflen;
@@ -321,7 +321,7 @@ void req_reply_error(struct request_context *req, NTSTATUS status)
 	if (!lp_nt_status_support() || !(req->smb->negotiate.client_caps & CAP_STATUS32)) {
 		/* convert to DOS error codes */
 		uint8 eclass;
-		uint32 ecode;
+		uint32_t ecode;
 		ntstatus_to_dos(status, &eclass, &ecode);
 		req_reply_dos_error(req, eclass, ecode);
 		return;
@@ -597,7 +597,7 @@ BOOL req_pull_blob(struct request_context *req, const char *src, int len, DATA_B
 
 /* check that a lump of data in a request is within the bounds of the data section of
    the packet */
-BOOL req_data_oob(struct request_context *req, const char *ptr, uint32 count)
+BOOL req_data_oob(struct request_context *req, const char *ptr, uint32_t count)
 {
 	if (count == 0) {
 		return False;
diff --git a/source4/smb_server/search.c b/source4/smb_server/search.c
index 0a6aaa6c25..55d1ae7c33 100644
--- a/source4/smb_server/search.c
+++ b/source4/smb_server/search.c
@@ -69,12 +69,12 @@ static void find_fill_info(struct request_context *req,
 			   union smb_search_data *file)
 {
 	char *p = req->out.data + req->out.data_size;
-	uint32 dos_date;
+	uint32_t dos_date;
 	char search_name[13];
 	
 	DEBUG(9,("find_fill_info: input file data: attr=0x%x size=%u time=0x%x name=%13s\n",
 		file->search.attrib, file->search.size,
-		(uint32)file->search.write_time, file->search.name));
+		(uint32_t)file->search.write_time, file->search.name));
 
 	p += req_append_bytes(req, file->search.search_id.data, 21);
 	p += req_append_bytes(req, (char*)&file->search.attrib, 1);
diff --git a/source4/smb_server/trans2.c b/source4/smb_server/trans2.c
index 4ea8bdf55c..46ab112374 100644
--- a/source4/smb_server/trans2.c
+++ b/source4/smb_server/trans2.c
@@ -500,7 +500,7 @@ static NTSTATUS trans2_fileinfo_fill(struct request_context *req, struct smb_tra
 			SSVAL(trans->out.params.data, 0, 0);
 			SIVAL(trans->out.data.data,  0, 0);
 		} else {
-			uint32 list_size = ea_list_size(st->all_eas.out.num_eas,
+			uint32_t list_size = ea_list_size(st->all_eas.out.num_eas,
 							st->all_eas.out.eas);
 			trans2_setup_reply(req, trans, 2, list_size, 0);
 			SSVAL(trans->out.params.data, 0, 0);
@@ -694,7 +694,7 @@ static NTSTATUS trans2_parse_sfileinfo(struct request_context *req,
 				       union smb_setfileinfo *st,
 				       const DATA_BLOB *blob)
 {
-	uint32 len;
+	uint32_t len;
 
 	switch (st->generic.level) {
 	case RAW_SFILEINFO_GENERIC: