From 0e95c8aa5c9658f50cc9e146474929152b2ade58 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 26 Oct 2011 08:54:11 +0200
Subject: 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
---
 source3/lib/time.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'source3')

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);
 }
 
 /*******************************************************************
-- 
cgit