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

metze
(This used to be commit 2986c5f08c8f0c26a2ea7b6ce20aae025183109f)

6 files changed, 20 insertions, 20 deletions

diff --git a/source4/libcli/raw/clispnego.c b/source4/libcli/raw/clispnego.c
index 7ad6be1006..ff7d45c8c1 100644
--- a/source4/libcli/raw/clispnego.c
+++ b/source4/libcli/raw/clispnego.c
@@ -26,7 +26,7 @@
   generate a negTokenInit packet given a GUID, a list of supported
   OIDs (the mechanisms) and a principal name string 
 */
-DATA_BLOB spnego_gen_negTokenInit(uint8 guid[16], 
+DATA_BLOB spnego_gen_negTokenInit(uint8_t guid[16], 
 				  const char *OIDs[], 
 				  const char *principal)
 {
@@ -260,7 +260,7 @@ BOOL parse_negTokenTarg(DATA_BLOB blob, char *OIDs[ASN1_MAX_OIDS], DATA_BLOB *se
 /*
   generate a krb5 GSS-API wrapper packet given a ticket
 */
-DATA_BLOB spnego_gen_krb5_wrap(DATA_BLOB ticket, const uint8 tok_id[2])
+DATA_BLOB spnego_gen_krb5_wrap(DATA_BLOB ticket, const uint8_t tok_id[2])
 {
 	ASN1_DATA data;
 	DATA_BLOB ret;
@@ -288,7 +288,7 @@ DATA_BLOB spnego_gen_krb5_wrap(DATA_BLOB ticket, const uint8 tok_id[2])
 /*
   parse a krb5 GSS-API wrapper packet giving a ticket
 */
-BOOL spnego_parse_krb5_wrap(DATA_BLOB blob, DATA_BLOB *ticket, uint8 tok_id[2])
+BOOL spnego_parse_krb5_wrap(DATA_BLOB blob, DATA_BLOB *ticket, uint8_t tok_id[2])
 {
 	BOOL ret;
 	ASN1_DATA data;
@@ -453,7 +453,7 @@ DATA_BLOB spnego_gen_auth_response(DATA_BLOB *reply, NTSTATUS nt_status,
 {
 	ASN1_DATA data;
 	DATA_BLOB ret;
-	uint8 negResult;
+	uint8_t negResult;
 
 	if (NT_STATUS_IS_OK(nt_status)) {
 		negResult = SPNEGO_NEG_RESULT_ACCEPT;
@@ -496,7 +496,7 @@ BOOL spnego_parse_auth_response(DATA_BLOB blob, NTSTATUS nt_status,
 				DATA_BLOB *auth)
 {
 	ASN1_DATA data;
-	uint8 negResult;
+	uint8_t negResult;
 
 	if (NT_STATUS_IS_OK(nt_status)) {
 		negResult = SPNEGO_NEG_RESULT_ACCEPT;
diff --git a/source4/libcli/raw/rawacl.c b/source4/libcli/raw/rawacl.c
index cfc086c7ce..ca93591597 100644
--- a/source4/libcli/raw/rawacl.c
+++ b/source4/libcli/raw/rawacl.c
@@ -27,7 +27,7 @@ struct cli_request *smb_raw_query_secdesc_send(struct cli_tree *tree,
 					       struct smb_query_secdesc *query)
 {
 	struct smb_nttrans nt;
-	uint8 params[8];
+	uint8_t params[8];
 
 	nt.in.max_setup = 0;
 	nt.in.max_param = 4;
@@ -108,7 +108,7 @@ struct cli_request *smb_raw_set_secdesc_send(struct cli_tree *tree,
 					     struct smb_set_secdesc *set)
 {
 	struct smb_nttrans nt;
-	uint8 params[8];
+	uint8_t params[8];
 	struct ndr_push *ndr;
 	struct cli_request *req;
 	NTSTATUS status;
diff --git a/source4/libcli/raw/rawdate.c b/source4/libcli/raw/rawdate.c
index e80c376bf7..3b731d653b 100644
--- a/source4/libcli/raw/rawdate.c
+++ b/source4/libcli/raw/rawdate.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 raw_push_dos_date(struct cli_transport *transport,
-		      uint8 *buf, int offset, time_t unixdate)
+		      uint8_t *buf, int offset, time_t unixdate)
 {
 	push_dos_date(buf, offset, unixdate, transport->negotiate.server_zone);
 }
@@ -56,7 +56,7 @@ void raw_push_dos_date3(struct cli_transport *transport,
 convert a dos date
 ********************************************************************/
 time_t raw_pull_dos_date(struct cli_transport *transport, 
-			 const uint8 *date_ptr)
+			 const uint8_t *date_ptr)
 {
 	return pull_dos_date(date_ptr, transport->negotiate.server_zone);
 }
@@ -65,7 +65,7 @@ time_t raw_pull_dos_date(struct cli_transport *transport,
 like raw_pull_dos_date() but the words are reversed
 ********************************************************************/
 time_t raw_pull_dos_date2(struct cli_transport *transport, 
-			  const uint8 *date_ptr)
+			  const uint8_t *date_ptr)
 {
 	return pull_dos_date2(date_ptr, transport->negotiate.server_zone);
 }
@@ -75,7 +75,7 @@ time_t raw_pull_dos_date2(struct cli_transport *transport,
   these arrive in server zone, with corresponding DST
   ******************************************************************/
 time_t raw_pull_dos_date3(struct cli_transport *transport,
-			  const uint8 *date_ptr)
+			  const uint8_t *date_ptr)
 {
 	return pull_dos_date3(date_ptr, transport->negotiate.server_zone);
 }
diff --git a/source4/libcli/raw/raweas.c b/source4/libcli/raw/raweas.c
index ae58790baa..e07fbcd288 100644
--- a/source4/libcli/raw/raweas.c
+++ b/source4/libcli/raw/raweas.c
@@ -68,7 +68,7 @@ uint_t ea_pull_struct(const DATA_BLOB *blob,
 		      TALLOC_CTX *mem_ctx,
 		      struct ea_struct *ea)
 {
-	uint8 nlen;
+	uint8_t nlen;
 	uint16_t vlen;
 
 	if (blob->length < 6) {
diff --git a/source4/libcli/raw/rawrequest.c b/source4/libcli/raw/rawrequest.c
index d7085ea3d2..fd2d85cc65 100644
--- a/source4/libcli/raw/rawrequest.c
+++ b/source4/libcli/raw/rawrequest.c
@@ -103,7 +103,7 @@ struct cli_request *cli_request_setup_nonsmb(struct cli_transport *transport, ui
   setup a SMB packet at transport level
 */
 struct cli_request *cli_request_setup_transport(struct cli_transport *transport,
-						uint8 command, unsigned wct, unsigned buflen)
+						uint8_t command, unsigned wct, unsigned buflen)
 {
 	struct cli_request *req;
 
@@ -149,7 +149,7 @@ struct cli_request *cli_request_setup_transport(struct cli_transport *transport,
   way. This interface is used before a session is setup.
 */
 struct cli_request *cli_request_setup_session(struct cli_session *session,
-					      uint8 command, unsigned wct, unsigned buflen)
+					      uint8_t command, unsigned wct, unsigned buflen)
 {
 	struct cli_request *req;
 	uint16_t flags2;
@@ -189,7 +189,7 @@ struct cli_request *cli_request_setup_session(struct cli_session *session,
   setup a request for tree based commands
 */
 struct cli_request *cli_request_setup(struct cli_tree *tree,
-				      uint8 command, 
+				      uint8_t command, 
 				      unsigned wct, unsigned buflen)
 {
 	struct cli_request *req;
@@ -343,7 +343,7 @@ static BOOL handle_oplock_break(struct cli_transport *transport, uint_t len, con
 	if (transport->oplock.handler) {
 		uint16_t tid = SVAL(hdr, HDR_TID);
 		uint16_t fnum = SVAL(vwv,VWV(2));
-		uint8 level = CVAL(vwv,VWV(3)+1);
+		uint8_t level = CVAL(vwv,VWV(3)+1);
 		transport->oplock.handler(transport, tid, fnum, level, transport->oplock.private);
 	}
 
@@ -599,7 +599,7 @@ size_t cli_req_append_string_len(struct cli_request *req, const char *str, unsig
 size_t cli_req_append_ascii4(struct cli_request *req, const char *str, unsigned flags)
 {
 	size_t size;
-	cli_req_append_bytes(req, (const uint8 *)"\4", 1);
+	cli_req_append_bytes(req, (const uint8_t *)"\4", 1);
 	size = cli_req_append_string(req, str, flags);
 	return size + 1;
 }
@@ -623,7 +623,7 @@ size_t cli_req_append_blob(struct cli_request *req, const DATA_BLOB *blob)
   append raw bytes into the data portion of the request packet
   return the number of bytes added
 */
-size_t cli_req_append_bytes(struct cli_request *req, const uint8 *bytes, size_t byte_len)
+size_t cli_req_append_bytes(struct cli_request *req, const uint8_t *bytes, size_t byte_len)
 {
 	cli_req_grow_allocation(req, byte_len + req->out.data_size);
 	memcpy(req->out.data + req->out.data_size, bytes, byte_len);
@@ -635,7 +635,7 @@ size_t cli_req_append_bytes(struct cli_request *req, const uint8 *bytes, size_t
   append variable block (type 5 buffer) into the data portion of the request packet
   return the number of bytes added
 */
-size_t cli_req_append_var_block(struct cli_request *req, const uint8 *bytes, uint16_t byte_len)
+size_t cli_req_append_var_block(struct cli_request *req, const uint8_t *bytes, uint16_t byte_len)
 {
 	cli_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/libcli/raw/rawtrans.c b/source4/libcli/raw/rawtrans.c
index 04dbcdc87d..fb2abf3e2d 100644
--- a/source4/libcli/raw/rawtrans.c
+++ b/source4/libcli/raw/rawtrans.c
@@ -206,7 +206,7 @@ NTSTATUS smb_raw_trans_recv(struct cli_request *req,
 ****************************************************************************/
 struct cli_request *smb_raw_trans_send_backend(struct cli_tree *tree,
 					       struct smb_trans2 *parms,
-					       uint8 command)
+					       uint8_t command)
 {
 	int wct = 14 + parms->in.setup_count;
 	struct cli_request *req;