Skip to content

Commit 355d576

Browse files
kbleesdscho
authored andcommitted
Win32: make FILETIME conversion functions public
We will use them in the upcoming "FSCache" patches (to accelerate sequential lstat() calls). Signed-off-by: Karsten Blees <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 79d55c8 commit 355d576

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

compat/mingw.c

-18
Original file line numberDiff line numberDiff line change
@@ -765,24 +765,6 @@ int mingw_chmod(const char *filename, int mode)
765765
return _wchmod(wfilename, mode);
766766
}
767767

768-
/*
769-
* The unit of FILETIME is 100-nanoseconds since January 1, 1601, UTC.
770-
* Returns the 100-nanoseconds ("hekto nanoseconds") since the epoch.
771-
*/
772-
static inline long long filetime_to_hnsec(const FILETIME *ft)
773-
{
774-
long long winTime = ((long long)ft->dwHighDateTime << 32) + ft->dwLowDateTime;
775-
/* Windows to Unix Epoch conversion */
776-
return winTime - 116444736000000000LL;
777-
}
778-
779-
static inline void filetime_to_timespec(const FILETIME *ft, struct timespec *ts)
780-
{
781-
long long hnsec = filetime_to_hnsec(ft);
782-
ts->tv_sec = (time_t)(hnsec / 10000000);
783-
ts->tv_nsec = (hnsec % 10000000) * 100;
784-
}
785-
786768
/**
787769
* Verifies that safe_create_leading_directories() would succeed.
788770
*/

compat/mingw.h

+18
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,17 @@ static inline int getrlimit(int resource, struct rlimit *rlp)
351351
return 0;
352352
}
353353

354+
/*
355+
* The unit of FILETIME is 100-nanoseconds since January 1, 1601, UTC.
356+
* Returns the 100-nanoseconds ("hekto nanoseconds") since the epoch.
357+
*/
358+
static inline long long filetime_to_hnsec(const FILETIME *ft)
359+
{
360+
long long winTime = ((long long)ft->dwHighDateTime << 32) + ft->dwLowDateTime;
361+
/* Windows to Unix Epoch conversion */
362+
return winTime - 116444736000000000LL;
363+
}
364+
354365
/*
355366
* Use mingw specific stat()/lstat()/fstat() implementations on Windows,
356367
* including our own struct stat with 64 bit st_size and nanosecond-precision
@@ -367,6 +378,13 @@ struct timespec {
367378
#endif
368379
#endif
369380

381+
static inline void filetime_to_timespec(const FILETIME *ft, struct timespec *ts)
382+
{
383+
long long hnsec = filetime_to_hnsec(ft);
384+
ts->tv_sec = (time_t)(hnsec / 10000000);
385+
ts->tv_nsec = (hnsec % 10000000) * 100;
386+
}
387+
370388
struct mingw_stat {
371389
_dev_t st_dev;
372390
_ino_t st_ino;

0 commit comments

Comments
 (0)