diff options
author | Stefan Metzmacher <metze@samba.org> | 2004-05-25 17:24:24 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:16 -0500 |
commit | f88bf54c7f6d1c2ef833047eb8327953c304b5ff (patch) | |
tree | 07da4ab8641b2200eaca5b5ea9adba26b0712277 /source4/lib/time.c | |
parent | f2ad98a165cdec6d344a96aeb21a38518a10720a (diff) | |
download | samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.tar.gz samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.tar.bz2 samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.zip |
r889: convert samba4 to use [u]int16_t instead of [u]int16
metze
(This used to be commit af6f1f8a01bebbecd99bc8c066519e89966e65e3)
Diffstat (limited to 'source4/lib/time.c')
-rw-r--r-- | source4/lib/time.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/time.c b/source4/lib/time.c index 99738d5a4a..1f95ef7daf 100644 --- a/source4/lib/time.c +++ b/source4/lib/time.c @@ -141,9 +141,9 @@ BOOL null_mtime(time_t mtime) /******************************************************************* create a 16 bit dos packed date ********************************************************************/ -static uint16 make_dos_date1(struct tm *t) +static uint16_t make_dos_date1(struct tm *t) { - uint16 ret=0; + uint16_t ret=0; ret = (((unsigned)(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; @@ -152,9 +152,9 @@ static uint16 make_dos_date1(struct tm *t) /******************************************************************* create a 16 bit dos packed time ********************************************************************/ -static uint16 make_dos_time1(struct tm *t) +static uint16_t make_dos_time1(struct tm *t) { - uint16 ret=0; + uint16_t ret=0; ret = ((((unsigned)t->tm_min >> 3)&0x7) | (((unsigned)t->tm_hour) << 3)); ret = ((ret&0xFF)<<8) | ((t->tm_sec/2) | ((t->tm_min & 0x7) << 5)); return ret; @@ -382,7 +382,7 @@ const char *nt_time_string(TALLOC_CTX *mem_ctx, NTTIME nt) /* put a NTTIME into a packet */ -void push_nttime(void *base, uint16 offset, NTTIME t) +void push_nttime(void *base, uint16_t offset, NTTIME t) { SBVAL(base, offset, t); } @@ -390,7 +390,7 @@ void push_nttime(void *base, uint16 offset, NTTIME t) /* pull a NTTIME from a packet */ -NTTIME pull_nttime(void *base, uint16 offset) +NTTIME pull_nttime(void *base, uint16_t offset) { NTTIME ret = BVAL(base, offset); return ret; |