sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

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

Browse Source 
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
This commit is contained in:
Jeremy Allison 2022-01-07 11:27:16 -08:00
parent 545442ec0c
commit c7488bf9e3
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/util/time.c
View File

@ -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. */
ret = nt_time_to_unix_timespec_raw(nt);
/*
* 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;
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;
}