From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 5 May 2006 13:02:14 +0000 (+0000)
Subject: r15457: Get rid of more usages of uint_t
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=849818dcdeb8eaf2eb22fea3896a4f7c777d8c5f;p=jelmer%2Fsamba4-debian.git

r15457: Get rid of more usages of uint_t
---

diff --git a/source/lib/util/time.c b/source/lib/util/time.c
index 4897d2fa9..6ad3a229e 100644
--- a/source/lib/util/time.c
+++ b/source/lib/util/time.c
@@ -139,7 +139,7 @@ _PUBLIC_ BOOL null_nttime(NTTIME t)
 static uint16_t make_dos_date1(struct tm *t)
 {
 	uint16_t ret=0;
-	ret = (((uint_t)(t->tm_mon+1)) >> 3) | ((t->tm_year-80) << 1);
+	ret = (((unsigned int)(t->tm_mon+1)) >> 3) | ((t->tm_year-80) << 1);
 	ret = ((ret&0xFF)<<8) | (t->tm_mday | (((t->tm_mon+1) & 0x7) << 5));
 	return ret;
 }
@@ -150,7 +150,7 @@ static uint16_t make_dos_date1(struct tm *t)
 static uint16_t make_dos_time1(struct tm *t)
 {
 	uint16_t ret=0;
-	ret = ((((uint_t)t->tm_min >> 3)&0x7) | (((uint_t)t->tm_hour) << 3));
+	ret = ((((unsigned int)t->tm_min >> 3)&0x7) | (((unsigned int)t->tm_hour) << 3));
 	ret = ((ret&0xFF)<<8) | ((t->tm_sec/2) | ((t->tm_min & 0x7) << 5));
 	return ret;
 }
@@ -440,7 +440,7 @@ _PUBLIC_ struct timeval timeval_add(const struct timeval *tv,
 			   uint32_t secs, uint32_t usecs)
 {
 	struct timeval tv2 = *tv;
-	const uint_t million = 1000000;
+	const unsigned int million = 1000000;
 	tv2.tv_sec += secs;
 	tv2.tv_usec += usecs;
 	tv2.tv_sec += tv2.tv_usec / million;
diff --git a/source/libcli/security/dom_sid.c b/source/libcli/security/dom_sid.c
index 39841e5a7..951c0f595 100644
--- a/source/libcli/security/dom_sid.c
+++ b/source/libcli/security/dom_sid.c
@@ -264,7 +264,7 @@ char *dom_sid_string(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
 		(sid->id_auth[2] << 24);
 
 	ofs = snprintf(ret, maxlen, "S-%u-%lu", 
-		       (uint_t)sid->sid_rev_num, (unsigned long)ia);
+		       (unsigned int)sid->sid_rev_num, (unsigned long)ia);
 
 	for (i = 0; i < sid->num_auths; i++) {
 		ofs += snprintf(ret + ofs, maxlen - ofs, "-%lu", (unsigned long)sid->sub_auths[i]);