jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 07:20:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows: Rewrite LargeSearchTime conversions

Browse Source 
Use LARGE_INTEGER to avoid the need for shifting and DWORD casts.
Take into account the size of time_t.

Change-Id: I056d920894b661ebb2060a5010efd9a0cd5a4a5d
Reviewed-on: http://gerrit.openafs.org/10673
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
This commit is contained in:
Jeffrey Altman 2013-11-27 14:41:18 -05:00
parent fd9d531802
commit da7adce6dd
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/WINNT/afsd/cm_utils.c
View File

@ -1053,26 +1053,29 @@ void cm_UpdateServerPriority()
void cm_LargeSearchTimeFromUnixTime(FILETIME *largeTimep, time_t unixTime)
{
// Note that LONGLONG is a 64-bit value
LONGLONG ll;
LARGE_INTEGER ll;
ll = Int32x32To64(unixTime, 10000000) + 116444736000000000;
largeTimep->dwLowDateTime = (DWORD)(ll & 0xFFFFFFFF);
largeTimep->dwHighDateTime = (DWORD)(ll >> 32);
#ifdef _USE_32BIT_TIME_T
ll.QuadPart = UInt32x32To64(unixTime, 10000000) + 116444736000000000;
#else
ll.QuadPart = unixTime * 10000000 + 116444736000000000;
#endif
largeTimep->dwLowDateTime = ll.LowPart;
largeTimep->dwHighDateTime = ll.HighPart;
}
void cm_UnixTimeFromLargeSearchTime(time_t *unixTimep, FILETIME *largeTimep)
{
// Note that LONGLONG is a 64-bit value
LONGLONG ll;
LARGE_INTEGER ll;
ll = largeTimep->dwHighDateTime;
ll <<= 32;
ll += largeTimep->dwLowDateTime;
ll.HighPart = largeTimep->dwHighDateTime;
ll.LowPart = largeTimep->dwLowDateTime;
ll -= 116444736000000000;
ll /= 10000000;
ll.QuadPart -= 116444736000000000;
ll.QuadPart /= 10000000;
*unixTimep = (DWORD)ll;
*unixTimep = (time_t)ll.QuadPart;
}
void cm_SearchTimeFromUnixTime(afs_uint32 *searchTimep, time_t unixTime)