svn commit: samba r15457 - in branches/SAMBA_4_0/source: lib/util libcli/security

[jelmer at samba.org]

Author: jelmer
Date: 2006-05-05 13:02:14 +0000 (Fri, 05 May 2006)
New Revision: 15457

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15457

Log:
Get rid of more usages of uint_t

Modified:
   branches/SAMBA_4_0/source/lib/util/time.c
   branches/SAMBA_4_0/source/libcli/security/dom_sid.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/util/time.c
===================================================================
--- branches/SAMBA_4_0/source/lib/util/time.c	2006-05-05 09:52:12 UTC (rev 15456)
+++ branches/SAMBA_4_0/source/lib/util/time.c	2006-05-05 13:02:14 UTC (rev 15457)
@@ -139,7 +139,7 @@
 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_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 @@
 			   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;

Modified: branches/SAMBA_4_0/source/libcli/security/dom_sid.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/security/dom_sid.c	2006-05-05 09:52:12 UTC (rev 15456)
+++ branches/SAMBA_4_0/source/libcli/security/dom_sid.c	2006-05-05 13:02:14 UTC (rev 15457)
@@ -264,7 +264,7 @@
 		(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]);