Muldersoft/cURL-build-win32
Muldersoft/cURL-build-win32
1
0
Fork 0
Code Issues Pull Requests Projects Releases 19 Wiki Activity

Small code refactoring.

Browse Source
This commit is contained in:
LoRd_MuldeR 2023-12-07 23:21:11 +01:00
parent ce235738e6
commit f7ee6be8ea
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
patch/nghttp2_time.diff
View File

@ -1,29 +1,24 @@
diff --git "a/lib/nghttp2_time.c" "b/lib/nghttp2_time.c" diff --git "a/lib/nghttp2_time.c" "b/lib/nghttp2_time.c"
index 897556f..ab06684 100644 index 897556f..0e4a804 100644
--- "a/lib/nghttp2_time.c" --- "a/lib/nghttp2_time.c"
+++ "b/lib/nghttp2_time.c" +++ "b/lib/nghttp2_time.c"
@@ -32,31 +32,15 @@ @@ -32,31 +32,16 @@
# include <sysinfoapi.h> # include <sysinfoapi.h>
#endif /* HAVE_SYSINFOAPI_H */ #endif /* HAVE_SYSINFOAPI_H */
-#if !defined(HAVE_GETTICKCOUNT64) || defined(__CYGWIN__) -#if !defined(HAVE_GETTICKCOUNT64) || defined(__CYGWIN__)
-static uint64_t time_now_sec(void) { -static uint64_t time_now_sec(void) {
- time_t t = time(NULL); - time_t t = time(NULL);
+uint64_t nghttp2_time_now_sec(void) -
+{
+ FILETIME file_time;
+ ULARGE_INTEGER time_value;
+
+ GetSystemTimeAsFileTime(&file_time);
- if (t == -1) { - if (t == -1) {
- return 0; - return 0;
- } - }
+ time_value.LowPart = file_time.dwLowDateTime; -
+ time_value.HighPart = file_time.dwHighDateTime;
- return (uint64_t)t; - return (uint64_t)t;
+ return time_value.QuadPart / 10000000ULL; +typedef union
+{
+ unsigned __int64 scalar;
+ FILETIME ft_struct;
} }
-#endif /* !HAVE_GETTICKCOUNT64 || __CYGWIN__ */ -#endif /* !HAVE_GETTICKCOUNT64 || __CYGWIN__ */
- -
@ -37,9 +32,15 @@ index 897556f..ab06684 100644
- if (rv == -1) { - if (rv == -1) {
- return time_now_sec(); - return time_now_sec();
- } - }
- +ftime_t;
- return (uint64_t)tp.tv_sec; - return (uint64_t)tp.tv_sec;
-} +uint64_t nghttp2_time_now_sec(void)
+{
+ ftime_t ftime;
+ GetSystemTimeAsFileTime(&(ftime.ft_struct));
+ return ftime.scalar / 10000000ULL;
}
-#else /* (!HAVE_CLOCK_GETTIME || __CYGWIN__) && !HAVE_GETTICKCOUNT64 */ -#else /* (!HAVE_CLOCK_GETTIME || __CYGWIN__) && !HAVE_GETTICKCOUNT64 */
-uint64_t nghttp2_time_now_sec(void) { return time_now_sec(); } -uint64_t nghttp2_time_now_sec(void) { return time_now_sec(); }
-#endif /* (!HAVE_CLOCK_GETTIME || __CYGWIN__) && !HAVE_GETTICKCOUNT64 */ -#endif /* (!HAVE_CLOCK_GETTIME || __CYGWIN__) && !HAVE_GETTICKCOUNT64 */