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

1 files changed, 114 insertions, 114 deletions

diff --git a/contrib/libs/curl/lib/getinfo.c b/contrib/libs/curl/lib/getinfo.c
index a4bcd99e1d..fd8f4e8430 100644
--- a/contrib/libs/curl/lib/getinfo.c
+++ b/contrib/libs/curl/lib/getinfo.c
@@ -5,11 +5,11 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. 
+ * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
- * are also available at https://curl.se/docs/copyright.html. 
+ * are also available at https://curl.se/docs/copyright.html.
  *
  * You may opt to use, copy, modify, merge, publish, distribute and/or sell
  * copies of the Software, and permit persons to whom the Software is
@@ -78,7 +78,7 @@ CURLcode Curl_initinfo(struct Curl_easy *data)
   info->conn_local_ip[0] = '\0';
   info->conn_primary_port = 0;
   info->conn_local_port = 0;
-  info->retry_after = 0; 
+  info->retry_after = 0;
 
   info->conn_scheme = 0;
   info->conn_protocol = 0;
@@ -96,34 +96,34 @@ static CURLcode getinfo_char(struct Curl_easy *data, CURLINFO info,
   case CURLINFO_EFFECTIVE_URL:
     *param_charp = data->change.url?data->change.url:(char *)"";
     break;
-  case CURLINFO_EFFECTIVE_METHOD: { 
-    const char *m = data->set.str[STRING_CUSTOMREQUEST]; 
-    if(!m) { 
-      if(data->set.opt_no_body) 
-        m = "HEAD"; 
-      else { 
-        switch(data->state.httpreq) { 
-        case HTTPREQ_POST: 
-        case HTTPREQ_POST_FORM: 
-        case HTTPREQ_POST_MIME: 
-          m = "POST"; 
-          break; 
-        case HTTPREQ_PUT: 
-          m = "PUT"; 
-          break; 
-        default: /* this should never happen */ 
-        case HTTPREQ_GET: 
-          m = "GET"; 
-          break; 
-        case HTTPREQ_HEAD: 
-          m = "HEAD"; 
-          break; 
-        } 
-      } 
-    } 
-    *param_charp = m; 
-  } 
-    break; 
+  case CURLINFO_EFFECTIVE_METHOD: {
+    const char *m = data->set.str[STRING_CUSTOMREQUEST];
+    if(!m) {
+      if(data->set.opt_no_body)
+        m = "HEAD";
+      else {
+        switch(data->state.httpreq) {
+        case HTTPREQ_POST:
+        case HTTPREQ_POST_FORM:
+        case HTTPREQ_POST_MIME:
+          m = "POST";
+          break;
+        case HTTPREQ_PUT:
+          m = "PUT";
+          break;
+        default: /* this should never happen */
+        case HTTPREQ_GET:
+          m = "GET";
+          break;
+        case HTTPREQ_HEAD:
+          m = "HEAD";
+          break;
+        }
+      }
+    }
+    *param_charp = m;
+  }
+    break;
   case CURLINFO_CONTENT_TYPE:
     *param_charp = data->info.contenttype;
     break;
@@ -176,33 +176,33 @@ static CURLcode getinfo_long(struct Curl_easy *data, CURLINFO info,
     long          *to_long;
   } lptr;
 
-#ifdef DEBUGBUILD 
-  char *timestr = getenv("CURL_TIME"); 
-  if(timestr) { 
-    unsigned long val = strtol(timestr, NULL, 10); 
-    switch(info) { 
-    case CURLINFO_LOCAL_PORT: 
-      *param_longp = (long)val; 
-      return CURLE_OK; 
-    default: 
-      break; 
-    } 
-  } 
-  /* use another variable for this to allow different values */ 
-  timestr = getenv("CURL_DEBUG_SIZE"); 
-  if(timestr) { 
-    unsigned long val = strtol(timestr, NULL, 10); 
-    switch(info) { 
-    case CURLINFO_HEADER_SIZE: 
-    case CURLINFO_REQUEST_SIZE: 
-      *param_longp = (long)val; 
-      return CURLE_OK; 
-    default: 
-      break; 
-    } 
-  } 
-#endif 
- 
+#ifdef DEBUGBUILD
+  char *timestr = getenv("CURL_TIME");
+  if(timestr) {
+    unsigned long val = strtol(timestr, NULL, 10);
+    switch(info) {
+    case CURLINFO_LOCAL_PORT:
+      *param_longp = (long)val;
+      return CURLE_OK;
+    default:
+      break;
+    }
+  }
+  /* use another variable for this to allow different values */
+  timestr = getenv("CURL_DEBUG_SIZE");
+  if(timestr) {
+    unsigned long val = strtol(timestr, NULL, 10);
+    switch(info) {
+    case CURLINFO_HEADER_SIZE:
+    case CURLINFO_REQUEST_SIZE:
+      *param_longp = (long)val;
+      return CURLE_OK;
+    default:
+      break;
+    }
+  }
+#endif
+
   switch(info) {
   case CURLINFO_RESPONSE_CODE:
     *param_longp = data->info.httpcode;
@@ -227,11 +227,11 @@ static CURLcode getinfo_long(struct Curl_easy *data, CURLINFO info,
   case CURLINFO_SSL_VERIFYRESULT:
     *param_longp = data->set.ssl.certverifyresult;
     break;
-#ifndef CURL_DISABLE_PROXY 
+#ifndef CURL_DISABLE_PROXY
   case CURLINFO_PROXY_SSL_VERIFYRESULT:
     *param_longp = data->set.proxy_ssl.certverifyresult;
     break;
-#endif 
+#endif
   case CURLINFO_REDIRECT_COUNT:
     *param_longp = data->set.followlocation;
     break;
@@ -269,15 +269,15 @@ static CURLcode getinfo_long(struct Curl_easy *data, CURLINFO info,
     /* Return the local port of the most recent (primary) connection */
     *param_longp = data->info.conn_local_port;
     break;
-  case CURLINFO_PROXY_ERROR: 
-    *param_longp = (long)data->info.pxcode; 
-    break; 
+  case CURLINFO_PROXY_ERROR:
+    *param_longp = (long)data->info.pxcode;
+    break;
   case CURLINFO_CONDITION_UNMET:
-    if(data->info.httpcode == 304) 
-      *param_longp = 1L; 
-    else 
-      /* return if the condition prevented the document to get transferred */ 
-      *param_longp = data->info.timecond ? 1L : 0L; 
+    if(data->info.httpcode == 304)
+      *param_longp = 1L;
+    else
+      /* return if the condition prevented the document to get transferred */
+      *param_longp = data->info.timecond ? 1L : 0L;
     break;
   case CURLINFO_RTSP_CLIENT_CSEQ:
     *param_longp = data->state.rtsp_next_client_CSeq;
@@ -322,27 +322,27 @@ static CURLcode getinfo_long(struct Curl_easy *data, CURLINFO info,
 static CURLcode getinfo_offt(struct Curl_easy *data, CURLINFO info,
                              curl_off_t *param_offt)
 {
-#ifdef DEBUGBUILD 
-  char *timestr = getenv("CURL_TIME"); 
-  if(timestr) { 
-    unsigned long val = strtol(timestr, NULL, 10); 
-    switch(info) { 
-    case CURLINFO_TOTAL_TIME_T: 
-    case CURLINFO_NAMELOOKUP_TIME_T: 
-    case CURLINFO_CONNECT_TIME_T: 
-    case CURLINFO_APPCONNECT_TIME_T: 
-    case CURLINFO_PRETRANSFER_TIME_T: 
-    case CURLINFO_STARTTRANSFER_TIME_T: 
-    case CURLINFO_REDIRECT_TIME_T: 
-    case CURLINFO_SPEED_DOWNLOAD_T: 
-    case CURLINFO_SPEED_UPLOAD_T: 
-      *param_offt = (curl_off_t)val; 
-      return CURLE_OK; 
-    default: 
-      break; 
-    } 
-  } 
-#endif 
+#ifdef DEBUGBUILD
+  char *timestr = getenv("CURL_TIME");
+  if(timestr) {
+    unsigned long val = strtol(timestr, NULL, 10);
+    switch(info) {
+    case CURLINFO_TOTAL_TIME_T:
+    case CURLINFO_NAMELOOKUP_TIME_T:
+    case CURLINFO_CONNECT_TIME_T:
+    case CURLINFO_APPCONNECT_TIME_T:
+    case CURLINFO_PRETRANSFER_TIME_T:
+    case CURLINFO_STARTTRANSFER_TIME_T:
+    case CURLINFO_REDIRECT_TIME_T:
+    case CURLINFO_SPEED_DOWNLOAD_T:
+    case CURLINFO_SPEED_UPLOAD_T:
+      *param_offt = (curl_off_t)val;
+      return CURLE_OK;
+    default:
+      break;
+    }
+  }
+#endif
   switch(info) {
   case CURLINFO_FILETIME_T:
     *param_offt = (curl_off_t)data->info.filetime;
@@ -354,7 +354,7 @@ static CURLcode getinfo_offt(struct Curl_easy *data, CURLINFO info,
     *param_offt = data->progress.downloaded;
     break;
   case CURLINFO_SPEED_DOWNLOAD_T:
-    *param_offt = data->progress.dlspeed; 
+    *param_offt = data->progress.dlspeed;
     break;
   case CURLINFO_SPEED_UPLOAD_T:
     *param_offt = data->progress.ulspeed;
@@ -367,7 +367,7 @@ static CURLcode getinfo_offt(struct Curl_easy *data, CURLINFO info,
     *param_offt = (data->progress.flags & PGRS_UL_SIZE_KNOWN)?
       data->progress.size_ul:-1;
     break;
-   case CURLINFO_TOTAL_TIME_T: 
+   case CURLINFO_TOTAL_TIME_T:
     *param_offt = data->progress.timespent;
     break;
   case CURLINFO_NAMELOOKUP_TIME_T:
@@ -401,27 +401,27 @@ static CURLcode getinfo_offt(struct Curl_easy *data, CURLINFO info,
 static CURLcode getinfo_double(struct Curl_easy *data, CURLINFO info,
                                double *param_doublep)
 {
-#ifdef DEBUGBUILD 
-  char *timestr = getenv("CURL_TIME"); 
-  if(timestr) { 
-    unsigned long val = strtol(timestr, NULL, 10); 
-    switch(info) { 
-    case CURLINFO_TOTAL_TIME: 
-    case CURLINFO_NAMELOOKUP_TIME: 
-    case CURLINFO_CONNECT_TIME: 
-    case CURLINFO_APPCONNECT_TIME: 
-    case CURLINFO_PRETRANSFER_TIME: 
-    case CURLINFO_STARTTRANSFER_TIME: 
-    case CURLINFO_REDIRECT_TIME: 
-    case CURLINFO_SPEED_DOWNLOAD: 
-    case CURLINFO_SPEED_UPLOAD: 
-      *param_doublep = (double)val; 
-      return CURLE_OK; 
-    default: 
-      break; 
-    } 
-  } 
-#endif 
+#ifdef DEBUGBUILD
+  char *timestr = getenv("CURL_TIME");
+  if(timestr) {
+    unsigned long val = strtol(timestr, NULL, 10);
+    switch(info) {
+    case CURLINFO_TOTAL_TIME:
+    case CURLINFO_NAMELOOKUP_TIME:
+    case CURLINFO_CONNECT_TIME:
+    case CURLINFO_APPCONNECT_TIME:
+    case CURLINFO_PRETRANSFER_TIME:
+    case CURLINFO_STARTTRANSFER_TIME:
+    case CURLINFO_REDIRECT_TIME:
+    case CURLINFO_SPEED_DOWNLOAD:
+    case CURLINFO_SPEED_UPLOAD:
+      *param_doublep = (double)val;
+      return CURLE_OK;
+    default:
+      break;
+    }
+  }
+#endif
   switch(info) {
   case CURLINFO_TOTAL_TIME:
     *param_doublep = DOUBLE_SECS(data->progress.timespent);
@@ -442,13 +442,13 @@ static CURLcode getinfo_double(struct Curl_easy *data, CURLINFO info,
     *param_doublep = DOUBLE_SECS(data->progress.t_starttransfer);
     break;
   case CURLINFO_SIZE_UPLOAD:
-    *param_doublep = (double)data->progress.uploaded; 
+    *param_doublep = (double)data->progress.uploaded;
     break;
   case CURLINFO_SIZE_DOWNLOAD:
     *param_doublep = (double)data->progress.downloaded;
     break;
   case CURLINFO_SPEED_DOWNLOAD:
-    *param_doublep = (double)data->progress.dlspeed; 
+    *param_doublep = (double)data->progress.dlspeed;
     break;
   case CURLINFO_SPEED_UPLOAD:
     *param_doublep = (double)data->progress.ulspeed;