summaryrefslogtreecommitdiff
path: root/source3/lib
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
commit44689b1ee78e9197db5ef041dbc5e0e2aa8e61f7 (patch)
tree4844f8d0d4838f45cffb61b8f229c0da6c13e5a4 /source3/lib
parent0e95c8aa5c9658f50cc9e146474929152b2ade58 (diff)
downloadsamba-44689b1ee78e9197db5ef041dbc5e0e2aa8e61f7.tar.gz
samba-44689b1ee78e9197db5ef041dbc5e0e2aa8e61f7.tar.bz2
samba-44689b1ee78e9197db5ef041dbc5e0e2aa8e61f7.zip
s3:lib: make_unix_date3() is the same as pull_dos_date3()
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
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/time.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/lib/time.c b/source3/lib/time.c
index e66941e27c..a83cb63e82 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -217,11 +217,7 @@ time_t make_unix_date2(const void *date_ptr, int zone_offset)
time_t make_unix_date3(const void *date_ptr, int zone_offset)
{
- time_t t = (time_t)IVAL(date_ptr,0);
- if (!null_time(t)) {
- t += zone_offset;
- }
- return(t);
+ return pull_dos_date3(date_ptr, zone_offset);
}
time_t srv_make_unix_date(const void *date_ptr)