summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-10-26 08:54:11 +0200
committerStefan Metzmacher <metze@samba.org>2011-10-26 09:42:04 +0200
commit0e95c8aa5c9658f50cc9e146474929152b2ade58 (patch)
tree8b8f7c8d893e9bfe076c9aaf88811f4e9829bb78
parenta1796465e83cb57d3ee3071e48c417cbd76692a5 (diff)
downloadsamba-0e95c8aa5c9658f50cc9e146474929152b2ade58.tar.gz
samba-0e95c8aa5c9658f50cc9e146474929152b2ade58.tar.bz2
samba-0e95c8aa5c9658f50cc9e146474929152b2ade58.zip
s3:lib: make_unix_date2() is the same as pull_dos_date2()
Except for a 'void *' vs. 'uint8_t *'. As a first step let make_unix_date() call pull_dos_date(), so that we he the logic only once. We can fix the callers later. metze
-rw-r--r--source3/lib/time.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/source3/lib/time.c b/source3/lib/time.c
index 7d93464586..e66941e27c 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -207,13 +207,7 @@ time_t make_unix_date(const void *date_ptr, int zone_offset)
time_t make_unix_date2(const void *date_ptr, int zone_offset)
{
- uint32_t x,x2;
-
- x = IVAL(date_ptr,0);
- x2 = ((x&0xFFFF)<<16) | ((x&0xFFFF0000)>>16);
- SIVAL(&x,0,x2);
-
- return(make_unix_date((const void *)&x, zone_offset));
+ return pull_dos_date2(date_ptr, zone_offset);
}
/*******************************************************************