s3:lib: make_unix_date() is the same as pull_dos_date()

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

diff --git a/source3/lib/time.c b/source3/lib/time.c
index 7fe53928ab72fdf96c59de0f124c69cb1c37e2d4..7d934645864e5e83f2eeef154198fc2aebb8fb6b 100644 (file)
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -198,25 +198,7 @@ void dos_filetime_timespec(struct timespec *tsp)
 
 time_t make_unix_date(const void *date_ptr, int zone_offset)
 {
-       uint32_t dos_date=0;
-       struct tm t;
-       time_t ret;
-
-       dos_date = IVAL(date_ptr,0);
-
-       if (dos_date == 0) {
-               return 0;
-       }
-  
-       interpret_dos_date(dos_date,&t.tm_year,&t.tm_mon,
-                       &t.tm_mday,&t.tm_hour,&t.tm_min,&t.tm_sec);
-       t.tm_isdst = -1;
-  
-       ret = timegm(&t);
-
-       ret += zone_offset;
-
-       return(ret);
+       return pull_dos_date(date_ptr, zone_offset);
 }
 
 /*******************************************************************