r890: convert samba4 to use [u]int8_t instead of [u]int8

metze
(This used to be commit 2986c5f08c8f0c26a2ea7b6ce20aae025183109f)

9 files changed, 19 insertions, 19 deletions

diff --git a/source4/smb_server/negprot.c b/source4/smb_server/negprot.c
index 42e706a816..9c9517e43b 100644
--- a/source4/smb_server/negprot.c
+++ b/source4/smb_server/negprot.c
@@ -24,7 +24,7 @@
 static void get_challenge(struct server_context *smb, char buff[8]) 
 {
 	NTSTATUS nt_status;
-	const uint8 *cryptkey;
+	const uint8_t *cryptkey;
 
 	/* muliple negprots are not premitted */
 	if (smb->negotiate.auth_context) {
@@ -182,7 +182,7 @@ static void reply_lanman2(struct request_context *req, uint16_t choice)
 static DATA_BLOB negprot_spnego(struct server_context *smb)
 {
 	DATA_BLOB blob;
-	uint8 guid[16];
+	uint8_t guid[16];
 	const char *OIDs_krb5[] = {OID_KERBEROS5,
 				   OID_KERBEROS5_OLD,
 				   OID_NTLMSSP,
diff --git a/source4/smb_server/nttrans.c b/source4/smb_server/nttrans.c
index 299d5b7333..955c9c493b 100644
--- a/source4/smb_server/nttrans.c
+++ b/source4/smb_server/nttrans.c
@@ -69,7 +69,7 @@ static NTSTATUS nttrans_ioctl(struct request_context *req,
 	union smb_ioctl nt;
 	uint32_t function;
 	uint16_t fnum;
-	uint8 filter;
+	uint8_t filter;
 	BOOL fsctl;
 	DATA_BLOB *blob;
 
diff --git a/source4/smb_server/reply.c b/source4/smb_server/reply.c
index 9a4cee2a66..341dddf26b 100644
--- a/source4/smb_server/reply.c
+++ b/source4/smb_server/reply.c
@@ -2289,7 +2289,7 @@ void reply_sendtxt(struct request_context *req)
 ****************************************************************************/
 void reply_special(struct request_context *req)
 {
-	uint8 msg_type;
+	uint8_t msg_type;
 	char buf[4];
 	
 	msg_type = CVAL(req->in.buffer,0);
diff --git a/source4/smb_server/request.c b/source4/smb_server/request.c
index 558d140600..4f7eb01103 100644
--- a/source4/smb_server/request.c
+++ b/source4/smb_server/request.c
@@ -292,7 +292,7 @@ void req_send_reply(struct request_context *req)
    construct and send an error packet with a forced DOS error code
    this is needed to match win2000 behaviour for some parts of the protocol
 */
-void req_reply_dos_error(struct request_context *req, uint8 eclass, uint16_t ecode)
+void req_reply_dos_error(struct request_context *req, uint8_t eclass, uint16_t ecode)
 {
 	/* if the basic packet hasn't been setup yet then do it now */
 	if (req->out.buffer == NULL) {
@@ -320,7 +320,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;
+		uint8_t eclass;
 		uint32_t ecode;
 		ntstatus_to_dos(status, &eclass, &ecode);
 		req_reply_dos_error(req, eclass, ecode);
@@ -395,7 +395,7 @@ size_t req_push_str(struct request_context *req, char *dest, const char *str, in
   return the number of bytes added
 */
 size_t req_append_bytes(struct request_context *req, 
-		const uint8 *bytes, size_t byte_len)
+		const uint8_t *bytes, size_t byte_len)
 {
 	req_grow_allocation(req, byte_len + req->out.data_size);
 	memcpy(req->out.data + req->out.data_size, bytes, byte_len);
@@ -407,7 +407,7 @@ size_t req_append_bytes(struct request_context *req,
   return the number of bytes added
 */
 size_t req_append_var_block(struct request_context *req, 
-		const uint8 *bytes, uint16_t byte_len)
+		const uint8_t *bytes, uint16_t byte_len)
 {
 	req_grow_allocation(req, byte_len + 3 + req->out.data_size);
 	SCVAL(req->out.data + req->out.data_size, 0, 5);
diff --git a/source4/smb_server/search.c b/source4/smb_server/search.c
index ae83a2b4a0..8a4b48387e 100644
--- a/source4/smb_server/search.c
+++ b/source4/smb_server/search.c
@@ -78,7 +78,7 @@ static void find_fill_info(struct request_context *req,
 
 	p += req_append_bytes(req, file->search.search_id.data, 21);
 	p += req_append_bytes(req, (char*)&file->search.attrib, 1);
-	srv_push_dos_date3(req->smb, (uint8 *)&dos_date, 0, file->search.write_time);
+	srv_push_dos_date3(req->smb, (uint8_t *)&dos_date, 0, file->search.write_time);
 	p += req_append_bytes(req, (char*)&dos_date, 4);
 	p += req_append_bytes(req, (char*)&file->search.size, 4);
 	memset(&search_name[0], ' ', 13);
diff --git a/source4/smb_server/signing.c b/source4/smb_server/signing.c
index 1440026291..76cd506aea 100644
--- a/source4/smb_server/signing.c
+++ b/source4/smb_server/signing.c
@@ -34,8 +34,8 @@ static void mark_packet_signed(struct request_context *req)
 /*
   calculate the signature for a message
 */
-static void calc_signature(uint8 *buffer, size_t length,
-			   DATA_BLOB *mac_key, uint8 signature[8])
+static void calc_signature(uint8_t *buffer, size_t length,
+			   DATA_BLOB *mac_key, uint8_t signature[8])
 {
 	unsigned char calc_md5_mac[16];
 	struct MD5Context md5_ctx;
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index 9d971383b5..5eded2b85b 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -25,7 +25,7 @@
 /*
   send an oplock break request to a client
 */
-BOOL req_send_oplock_break(struct tcon_context *conn, uint16_t fnum, uint8 level)
+BOOL req_send_oplock_break(struct tcon_context *conn, uint16_t fnum, uint8_t level)
 {
 	struct request_context *req;
 
@@ -415,7 +415,7 @@ static const struct smb_message_struct
 /****************************************************************************
 return a string containing the function name of a SMB command
 ****************************************************************************/
-static const char *smb_fn_name(uint8 type)
+static const char *smb_fn_name(uint8_t type)
 {
 	const char *unknown_name = "SMBunknown";
 
@@ -550,7 +550,7 @@ static void switch_message(int type, struct request_context *req)
 ****************************************************************************/
 static void construct_reply(struct request_context *req)
 {
-	uint8 type = CVAL(req->in.hdr,HDR_COM);
+	uint8_t type = CVAL(req->in.hdr,HDR_COM);
 
 	/* see if its a special NBT packet */
 	if (CVAL(req->in.buffer,0) != 0) {
diff --git a/source4/smb_server/srvtime.c b/source4/smb_server/srvtime.c
index c6a0606e89..7eeb1fcff9 100644
--- a/source4/smb_server/srvtime.c
+++ b/source4/smb_server/srvtime.c
@@ -27,7 +27,7 @@ put a dos date into a buffer (time/date format)
 This takes GMT time and puts local time for zone_offset in the buffer
 ********************************************************************/
 void srv_push_dos_date(struct server_context *smb_server,
-		      uint8 *buf, int offset, time_t unixdate)
+		      uint8_t *buf, int offset, time_t unixdate)
 {
 	push_dos_date(buf, offset, unixdate, smb_server->negotiate.zone_offset);
 }
@@ -56,7 +56,7 @@ void srv_push_dos_date3(struct server_context *smb_server,
 convert a dos date
 ********************************************************************/
 time_t srv_pull_dos_date(struct server_context *smb_server, 
-			 const uint8 *date_ptr)
+			 const uint8_t *date_ptr)
 {
 	return pull_dos_date(date_ptr, smb_server->negotiate.zone_offset);
 }
@@ -65,7 +65,7 @@ time_t srv_pull_dos_date(struct server_context *smb_server,
 like srv_pull_dos_date() but the words are reversed
 ********************************************************************/
 time_t srv_pull_dos_date2(struct server_context *smb_server, 
-			  const uint8 *date_ptr)
+			  const uint8_t *date_ptr)
 {
 	return pull_dos_date2(date_ptr, smb_server->negotiate.zone_offset);
 }
@@ -75,7 +75,7 @@ time_t srv_pull_dos_date2(struct server_context *smb_server,
   these arrive in server zone, with corresponding DST
   ******************************************************************/
 time_t srv_pull_dos_date3(struct server_context *smb_server,
-			  const uint8 *date_ptr)
+			  const uint8_t *date_ptr)
 {
 	return pull_dos_date3(date_ptr, smb_server->negotiate.zone_offset);
 }
diff --git a/source4/smb_server/trans2.c b/source4/smb_server/trans2.c
index e416b63bd4..b755c6dd7c 100644
--- a/source4/smb_server/trans2.c
+++ b/source4/smb_server/trans2.c
@@ -1238,7 +1238,7 @@ static NTSTATUS trans_backend(struct request_context *req, struct smb_trans2 *tr
 /****************************************************************************
  Reply to an SMBtrans or SMBtrans2 request
 ****************************************************************************/
-void reply_trans_generic(struct request_context *req, uint8 command)
+void reply_trans_generic(struct request_context *req, uint8_t command)
 {
 	struct smb_trans2 trans;
 	int i;