diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-05-05 13:02:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:37 -0500 |
| commit | b56789c3491d227dd4107a37de701101c780a0f9 (patch) | |
| tree | 8c7f257a426c6c8b445b2203a1a9427eac7baa91 | |
| parent | 9604b161add82ed4e9039b81c59235ea678defca (diff) | |
| download | samba-b56789c3491d227dd4107a37de701101c780a0f9.tar.gz samba-b56789c3491d227dd4107a37de701101c780a0f9.tar.bz2 samba-b56789c3491d227dd4107a37de701101c780a0f9.zip | |
r15457: Get rid of more usages of uint_t
(This used to be commit 849818dcdeb8eaf2eb22fea3896a4f7c777d8c5f)
| -rw-r--r-- | source4/lib/util/time.c | 6 | ||||
| -rw-r--r-- | source4/libcli/security/dom_sid.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/util/time.c b/source4/lib/util/time.c index 4897d2fa95..6ad3a229e3 100644 --- a/source4/lib/util/time.c +++ b/source4/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/source4/libcli/security/dom_sid.c b/source4/libcli/security/dom_sid.c index 39841e5a70..951c0f5956 100644 --- a/source4/libcli/security/dom_sid.c +++ b/source4/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]); |