From fa2e9ec311b99dee2fbff5ee5fa2c743298dacad Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 1 Jun 2004 08:12:45 +0000
Subject: r960: convert 'unsigned int' to uint_t in the most places

metze
(This used to be commit 18062d2ed9fc9224c43143c10efbf2f6f1f5bbe0)
---
 source4/libcli/auth/ntlmssp.h | 2 +-
 source4/libcli/clifile.c      | 2 +-
 source4/libcli/namequery.c    | 6 +++---
 source4/libcli/nmblib.c       | 2 +-
 source4/libcli/util/dom_sid.c | 2 +-
 source4/libcli/util/smbdes.c  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'source4/libcli')

diff --git a/source4/libcli/auth/ntlmssp.h b/source4/libcli/auth/ntlmssp.h
index 968911fef5..aa7aa7e02b 100644
--- a/source4/libcli/auth/ntlmssp.h
+++ b/source4/libcli/auth/ntlmssp.h
@@ -74,7 +74,7 @@ enum NTLM_MESSAGE_TYPE
 typedef struct ntlmssp_state 
 {
 	TALLOC_CTX *mem_ctx;
-	unsigned int ref_count;
+	uint_t ref_count;
 	enum NTLMSSP_ROLE role;
 	enum samr_Role server_role;
 	uint32_t expected_state;
diff --git a/source4/libcli/clifile.c b/source4/libcli/clifile.c
index 23f3cdc4a4..7f4384a222 100644
--- a/source4/libcli/clifile.c
+++ b/source4/libcli/clifile.c
@@ -53,7 +53,7 @@ static NTSTATUS cli_link_internal(struct cli_tree *tree,
 ****************************************************************************/
 static uint32_t unix_perms_to_wire(mode_t perms)
 {
-        unsigned int ret = 0;
+        uint_t ret = 0;
 
         ret |= ((perms & S_IXOTH) ?  UNIX_X_OTH : 0);
         ret |= ((perms & S_IWOTH) ?  UNIX_W_OTH : 0);
diff --git a/source4/libcli/namequery.c b/source4/libcli/namequery.c
index a04e883138..fc6a93d8e1 100644
--- a/source4/libcli/namequery.c
+++ b/source4/libcli/namequery.c
@@ -1121,8 +1121,8 @@ NT GETDC call, UNICODE, NT domain SID and uncle tom cobbley and all...
 			buf -= 4;
 
 			if (CVAL(buf,smb_com) != SMBtrans) {
-				DEBUG(0,("lookup_pdc_name: datagram type %u != SMBtrans(%u)\n", (unsigned int)
-					 CVAL(buf,smb_com), (unsigned int)SMBtrans ));
+				DEBUG(0,("lookup_pdc_name: datagram type %u != SMBtrans(%u)\n", (uint_t)
+					 CVAL(buf,smb_com), (uint_t)SMBtrans ));
 				free_packet(p_ret);
 				continue;
 			}
@@ -1142,7 +1142,7 @@ NT GETDC call, UNICODE, NT domain SID and uncle tom cobbley and all...
 
 			if(SVAL(buf2,0) != QUERYFORPDC_R) {
 				DEBUG(0,("lookup_pdc_name: datagram type (%u) != QUERYFORPDC_R(%u)\n",
-					 (unsigned int)SVAL(buf,0), (unsigned int)QUERYFORPDC_R ));
+					 (uint_t)SVAL(buf,0), (uint_t)QUERYFORPDC_R ));
 				free_packet(p_ret);
 				continue;
 			}
diff --git a/source4/libcli/nmblib.c b/source4/libcli/nmblib.c
index 0fe9ee2453..ef61686e57 100644
--- a/source4/libcli/nmblib.c
+++ b/source4/libcli/nmblib.c
@@ -812,7 +812,7 @@ void make_nmb_name( struct nmb_name *n, const char *name, int type)
 {
 	memset( (char *)n, '\0', sizeof(struct nmb_name) );
 	push_ascii(n->name, name, 16, STR_TERMINATE|STR_UPPER);
-	n->name_type = (unsigned int)type & 0xFF;
+	n->name_type = (uint_t)type & 0xFF;
 	StrnCpy( n->scope, lp_netbios_scope(), 63 );
 	strupper( n->scope );
 }
diff --git a/source4/libcli/util/dom_sid.c b/source4/libcli/util/dom_sid.c
index 88ece25a8e..cdf89ccf96 100644
--- a/source4/libcli/util/dom_sid.c
+++ b/source4/libcli/util/dom_sid.c
@@ -28,7 +28,7 @@
 struct dom_sid *dom_sid_parse_talloc(TALLOC_CTX *mem_ctx, const char *sidstr)
 {
 	struct dom_sid *ret;
-	unsigned int rev, ia, num_sub_auths, i;
+	uint_t rev, ia, num_sub_auths, i;
 	char *p;
   
 	if (strncasecmp(sidstr, "S-", 2)) {
diff --git a/source4/libcli/util/smbdes.c b/source4/libcli/util/smbdes.c
index b0efdec157..b2e46e759d 100644
--- a/source4/libcli/util/smbdes.c
+++ b/source4/libcli/util/smbdes.c
@@ -412,7 +412,7 @@ void SamOEMhash(uint8_t *data, const uint8_t keystr[16], int len)
 /* Decode a sam password hash into a password.  The password hash is the
    same method used to store passwords in the NT registry.  The DES key
    used is based on the RID of the user. */
-void sam_pwd_hash(unsigned int rid, const uchar *in, uchar *out, int forw)
+void sam_pwd_hash(uint_t rid, const uchar *in, uchar *out, int forw)
 {
 	uchar s[14];
 
-- 
cgit