Restoring authorship annotation for <orivej@yandex-team.ru>. Commit 2 of 2.

1 files changed, 36 insertions, 36 deletions

diff --git a/contrib/libs/curl/lib/timeval.c b/contrib/libs/curl/lib/timeval.c
index 61f7810da5..8523dad400 100644
--- a/contrib/libs/curl/lib/timeval.c
+++ b/contrib/libs/curl/lib/timeval.c
@@ -24,35 +24,35 @@
 
 #if defined(WIN32) && !defined(MSDOS)
 
-/* set in win32_init() */ 
-extern LARGE_INTEGER Curl_freq; 
-extern bool Curl_isVistaOrGreater; 
- 
+/* set in win32_init() */
+extern LARGE_INTEGER Curl_freq;
+extern bool Curl_isVistaOrGreater;
+
 /* In case of bug fix this function has a counterpart in tool_util.c */
 struct curltime Curl_now(void)
 {
   struct curltime now;
-  if(Curl_isVistaOrGreater) { /* QPC timer might have issues pre-Vista */ 
-    LARGE_INTEGER count; 
-    QueryPerformanceCounter(&count); 
-    now.tv_sec = (time_t)(count.QuadPart / Curl_freq.QuadPart); 
-    now.tv_usec = (int)((count.QuadPart % Curl_freq.QuadPart) * 1000000 / 
-                        Curl_freq.QuadPart); 
-  } 
-  else { 
-    /* Disable /analyze warning that GetTickCount64 is preferred  */ 
-#if defined(_MSC_VER) 
-#pragma warning(push) 
-#pragma warning(disable:28159) 
+  if(Curl_isVistaOrGreater) { /* QPC timer might have issues pre-Vista */
+    LARGE_INTEGER count;
+    QueryPerformanceCounter(&count);
+    now.tv_sec = (time_t)(count.QuadPart / Curl_freq.QuadPart);
+    now.tv_usec = (int)((count.QuadPart % Curl_freq.QuadPart) * 1000000 /
+                        Curl_freq.QuadPart);
+  }
+  else {
+    /* Disable /analyze warning that GetTickCount64 is preferred  */
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:28159)
+#endif
+    DWORD milliseconds = GetTickCount();
+#if defined(_MSC_VER)
+#pragma warning(pop)
 #endif
-    DWORD milliseconds = GetTickCount(); 
-#if defined(_MSC_VER) 
-#pragma warning(pop) 
-#endif 
-
-    now.tv_sec = milliseconds / 1000; 
-    now.tv_usec = (milliseconds % 1000) * 1000; 
-  } 
+
+    now.tv_sec = milliseconds / 1000;
+    now.tv_usec = (milliseconds % 1000) * 1000;
+  }
   return now;
 }
 
@@ -67,9 +67,9 @@ struct curltime Curl_now(void)
   ** in any case the time starting point does not change once that the
   ** system has started up.
   */
-#ifdef HAVE_GETTIMEOFDAY 
+#ifdef HAVE_GETTIMEOFDAY
   struct timeval now;
-#endif 
+#endif
   struct curltime cnow;
   struct timespec tsnow;
 
@@ -183,11 +183,11 @@ struct curltime Curl_now(void)
  */
 timediff_t Curl_timediff(struct curltime newer, struct curltime older)
 {
-  timediff_t diff = (timediff_t)newer.tv_sec-older.tv_sec; 
-  if(diff >= (TIMEDIFF_T_MAX/1000)) 
-    return TIMEDIFF_T_MAX; 
-  else if(diff <= (TIMEDIFF_T_MIN/1000)) 
-    return TIMEDIFF_T_MIN; 
+  timediff_t diff = (timediff_t)newer.tv_sec-older.tv_sec;
+  if(diff >= (TIMEDIFF_T_MAX/1000))
+    return TIMEDIFF_T_MAX;
+  else if(diff <= (TIMEDIFF_T_MIN/1000))
+    return TIMEDIFF_T_MIN;
   return diff * 1000 + (newer.tv_usec-older.tv_usec)/1000;
 }
 
@@ -197,10 +197,10 @@ timediff_t Curl_timediff(struct curltime newer, struct curltime older)
  */
 timediff_t Curl_timediff_us(struct curltime newer, struct curltime older)
 {
-  timediff_t diff = (timediff_t)newer.tv_sec-older.tv_sec; 
-  if(diff >= (TIMEDIFF_T_MAX/1000000)) 
-    return TIMEDIFF_T_MAX; 
-  else if(diff <= (TIMEDIFF_T_MIN/1000000)) 
-    return TIMEDIFF_T_MIN; 
+  timediff_t diff = (timediff_t)newer.tv_sec-older.tv_sec;
+  if(diff >= (TIMEDIFF_T_MAX/1000000))
+    return TIMEDIFF_T_MAX;
+  else if(diff <= (TIMEDIFF_T_MIN/1000000))
+    return TIMEDIFF_T_MIN;
   return diff * 1000000 + newer.tv_usec-older.tv_usec;
 }