From: Jeremy Allison <jra@samba.org>
Date: Fri, 7 Jan 2022 19:27:16 +0000 (-0800)
Subject: lib: util: Make nt_time_to_full_timespec() call nt_time_to_unix_timespec_raw() for... 
X-Git-Tag: tdb-1.4.6~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7488bf9e39ee4560061bf90a42c60c9590f7ff2;p=thirdparty%2Fsamba.git

lib: util: Make nt_time_to_full_timespec() call nt_time_to_unix_timespec_raw() for the conversion.

Cleanup to eliminate duplicate code.

The high check is now done against ret.tv_sec,
not 'd', as after calling nt_time_to_unix_timespec_raw()
this is identical to the previous intermediate 'd'
variable.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Jan 11 01:36:51 UTC 2022 on sn-devel-184
---

diff --git a/lib/util/time.c b/lib/util/time.c
index bb4fedfcaa9..f1d6b566618 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -1135,7 +1135,6 @@ NTTIME full_timespec_to_nt_time(const struct timespec *_ts)
  **/
 struct timespec nt_time_to_full_timespec(NTTIME nt)
 {
-	int64_t d;
 	struct timespec ret;
 
 	if (nt == NTTIME_OMIT) {
@@ -1152,29 +1151,14 @@ struct timespec nt_time_to_full_timespec(NTTIME nt)
 		nt = NTTIME_MAX;
 	}
 
-	d = (int64_t)nt;
-	/* d is now in 100ns units, since jan 1st 1601".
-	   Save off the ns fraction. */
-
-	/*
-	 * Take the last seven decimal digits and multiply by 100.
-	 * to convert from 100ns units to 1ns units.
-	 */
-        ret.tv_nsec = (long) ((d % (1000 * 1000 * 10)) * 100);
-
-	/* Convert to seconds */
-	d /= 1000*1000*10;
-
-	/* Now adjust by 369 years to make the secs since 1970 */
-	d -= TIME_FIXUP_CONSTANT_INT;
+	ret = nt_time_to_unix_timespec_raw(nt);
 
-	if (d >= (int64_t)TIME_T_MAX) {
+	if (ret.tv_sec >= TIME_T_MAX) {
 		ret.tv_sec = TIME_T_MAX;
 		ret.tv_nsec = 0;
 		return ret;
 	}
 
-	ret.tv_sec = (time_t)d;
 	return ret;
 }