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

1 files changed, 60 insertions, 60 deletions

diff --git a/contrib/libs/curl/lib/doh.c b/contrib/libs/curl/lib/doh.c
index c0d480da6f..c2b76de53a 100644
--- a/contrib/libs/curl/lib/doh.c
+++ b/contrib/libs/curl/lib/doh.c
@@ -22,8 +22,8 @@
 
 #include "curl_setup.h"
 
-#ifndef CURL_DISABLE_DOH 
- 
+#ifndef CURL_DISABLE_DOH
+
 #include "urldata.h"
 #include "curl_addrinfo.h"
 #include "doh.h"
@@ -192,7 +192,7 @@ static int Curl_doh_done(struct Curl_easy *doh, CURLcode result)
   struct Curl_easy *data = doh->set.dohfor;
   /* so one of the DOH request done for the 'data' transfer is now complete! */
   data->req.doh.pending--;
-  infof(data, "a DOH request is completed, %u to go\n", data->req.doh.pending); 
+  infof(data, "a DOH request is completed, %u to go\n", data->req.doh.pending);
   if(result)
     infof(data, "DOH request %s\n", curl_easy_strerror(result));
 
@@ -205,11 +205,11 @@ static int Curl_doh_done(struct Curl_easy *doh, CURLcode result)
   return 0;
 }
 
-#define ERROR_CHECK_SETOPT(x,y) \ 
-do {                                      \ 
-  result = curl_easy_setopt(doh, x, y);   \ 
-  if(result)                              \ 
-    goto error;                           \ 
+#define ERROR_CHECK_SETOPT(x,y) \
+do {                                      \
+  result = curl_easy_setopt(doh, x, y);   \
+  if(result)                              \
+    goto error;                           \
 } while(0)
 
 static CURLcode dohprobe(struct Curl_easy *data,
@@ -281,20 +281,20 @@ static CURLcode dohprobe(struct Curl_easy *data,
     ERROR_CHECK_SETOPT(CURLOPT_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
 #endif
     ERROR_CHECK_SETOPT(CURLOPT_TIMEOUT_MS, (long)timeout_ms);
-    if(data->set.verbose) 
-      ERROR_CHECK_SETOPT(CURLOPT_VERBOSE, 1L); 
-    if(data->set.no_signal) 
-      ERROR_CHECK_SETOPT(CURLOPT_NOSIGNAL, 1L); 
- 
-    /* Inherit *some* SSL options from the user's transfer. This is a 
-       best-guess as to which options are needed for compatibility. #3661 */ 
-    if(data->set.ssl.falsestart) 
-      ERROR_CHECK_SETOPT(CURLOPT_SSL_FALSESTART, 1L); 
-    if(data->set.ssl.primary.verifyhost) 
-      ERROR_CHECK_SETOPT(CURLOPT_SSL_VERIFYHOST, 2L); 
+    if(data->set.verbose)
+      ERROR_CHECK_SETOPT(CURLOPT_VERBOSE, 1L);
+    if(data->set.no_signal)
+      ERROR_CHECK_SETOPT(CURLOPT_NOSIGNAL, 1L);
+
+    /* Inherit *some* SSL options from the user's transfer. This is a
+       best-guess as to which options are needed for compatibility. #3661 */
+    if(data->set.ssl.falsestart)
+      ERROR_CHECK_SETOPT(CURLOPT_SSL_FALSESTART, 1L);
+    if(data->set.ssl.primary.verifyhost)
+      ERROR_CHECK_SETOPT(CURLOPT_SSL_VERIFYHOST, 2L);
 #ifndef CURL_DISABLE_PROXY
-    if(data->set.proxy_ssl.primary.verifyhost) 
-      ERROR_CHECK_SETOPT(CURLOPT_PROXY_SSL_VERIFYHOST, 2L); 
+    if(data->set.proxy_ssl.primary.verifyhost)
+      ERROR_CHECK_SETOPT(CURLOPT_PROXY_SSL_VERIFYHOST, 2L);
     if(data->set.proxy_ssl.primary.verifypeer)
       ERROR_CHECK_SETOPT(CURLOPT_PROXY_SSL_VERIFYPEER, 1L);
     if(data->set.str[STRING_SSL_CAFILE_PROXY]) {
@@ -315,45 +315,45 @@ static CURLcode dohprobe(struct Curl_easy *data,
         data->set.str[STRING_SSL_CAPATH_PROXY]);
     }
 #endif
-    if(data->set.ssl.primary.verifypeer) 
-      ERROR_CHECK_SETOPT(CURLOPT_SSL_VERIFYPEER, 1L); 
-    if(data->set.ssl.primary.verifystatus) 
-      ERROR_CHECK_SETOPT(CURLOPT_SSL_VERIFYSTATUS, 1L); 
-    if(data->set.str[STRING_SSL_CAFILE_ORIG]) { 
-      ERROR_CHECK_SETOPT(CURLOPT_CAINFO, 
-        data->set.str[STRING_SSL_CAFILE_ORIG]); 
-    } 
-    if(data->set.str[STRING_SSL_CAPATH_ORIG]) { 
-      ERROR_CHECK_SETOPT(CURLOPT_CAPATH, 
-        data->set.str[STRING_SSL_CAPATH_ORIG]); 
-    } 
-    if(data->set.str[STRING_SSL_CRLFILE_ORIG]) { 
-      ERROR_CHECK_SETOPT(CURLOPT_CRLFILE, 
-        data->set.str[STRING_SSL_CRLFILE_ORIG]); 
-    } 
-    if(data->set.ssl.certinfo) 
-      ERROR_CHECK_SETOPT(CURLOPT_CERTINFO, 1L); 
-    if(data->set.str[STRING_SSL_RANDOM_FILE]) { 
-      ERROR_CHECK_SETOPT(CURLOPT_RANDOM_FILE, 
-        data->set.str[STRING_SSL_RANDOM_FILE]); 
-    } 
-    if(data->set.str[STRING_SSL_EGDSOCKET]) { 
-      ERROR_CHECK_SETOPT(CURLOPT_EGDSOCKET, 
-        data->set.str[STRING_SSL_EGDSOCKET]); 
-    } 
-    if(data->set.ssl.no_revoke) 
-      ERROR_CHECK_SETOPT(CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE); 
+    if(data->set.ssl.primary.verifypeer)
+      ERROR_CHECK_SETOPT(CURLOPT_SSL_VERIFYPEER, 1L);
+    if(data->set.ssl.primary.verifystatus)
+      ERROR_CHECK_SETOPT(CURLOPT_SSL_VERIFYSTATUS, 1L);
+    if(data->set.str[STRING_SSL_CAFILE_ORIG]) {
+      ERROR_CHECK_SETOPT(CURLOPT_CAINFO,
+        data->set.str[STRING_SSL_CAFILE_ORIG]);
+    }
+    if(data->set.str[STRING_SSL_CAPATH_ORIG]) {
+      ERROR_CHECK_SETOPT(CURLOPT_CAPATH,
+        data->set.str[STRING_SSL_CAPATH_ORIG]);
+    }
+    if(data->set.str[STRING_SSL_CRLFILE_ORIG]) {
+      ERROR_CHECK_SETOPT(CURLOPT_CRLFILE,
+        data->set.str[STRING_SSL_CRLFILE_ORIG]);
+    }
+    if(data->set.ssl.certinfo)
+      ERROR_CHECK_SETOPT(CURLOPT_CERTINFO, 1L);
+    if(data->set.str[STRING_SSL_RANDOM_FILE]) {
+      ERROR_CHECK_SETOPT(CURLOPT_RANDOM_FILE,
+        data->set.str[STRING_SSL_RANDOM_FILE]);
+    }
+    if(data->set.str[STRING_SSL_EGDSOCKET]) {
+      ERROR_CHECK_SETOPT(CURLOPT_EGDSOCKET,
+        data->set.str[STRING_SSL_EGDSOCKET]);
+    }
+    if(data->set.ssl.no_revoke)
+      ERROR_CHECK_SETOPT(CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE);
     else if(data->set.ssl.revoke_best_effort)
       ERROR_CHECK_SETOPT(CURLOPT_SSL_OPTIONS, CURLSSLOPT_REVOKE_BEST_EFFORT);
-    if(data->set.ssl.fsslctx) 
-      ERROR_CHECK_SETOPT(CURLOPT_SSL_CTX_FUNCTION, data->set.ssl.fsslctx); 
-    if(data->set.ssl.fsslctxp) 
-      ERROR_CHECK_SETOPT(CURLOPT_SSL_CTX_DATA, data->set.ssl.fsslctxp); 
+    if(data->set.ssl.fsslctx)
+      ERROR_CHECK_SETOPT(CURLOPT_SSL_CTX_FUNCTION, data->set.ssl.fsslctx);
+    if(data->set.ssl.fsslctxp)
+      ERROR_CHECK_SETOPT(CURLOPT_SSL_CTX_DATA, data->set.ssl.fsslctxp);
     if(data->set.str[STRING_SSL_EC_CURVES]) {
       ERROR_CHECK_SETOPT(CURLOPT_SSL_EC_CURVES,
         data->set.str[STRING_SSL_EC_CURVES]);
     }
- 
+
     doh->set.fmultidone = Curl_doh_done;
     doh->set.dohfor = data; /* identify for which transfer this is done */
     p->easy = doh;
@@ -641,7 +641,7 @@ UNITTEST DOHcode doh_decode(const unsigned char *doh,
 
   ancount = get16bit(doh, 6);
   while(ancount) {
-    unsigned short class; 
+    unsigned short class;
     unsigned int ttl;
 
     rc = skipqname(doh, dohlen, &index);
@@ -948,9 +948,9 @@ CURLcode Curl_doh_is_resolved(struct connectdata *conn,
     result = CURLE_COULDNT_RESOLVE_HOST; /* until we know better */
     if(!rc[DOH_PROBE_SLOT_IPADDR_V4] || !rc[DOH_PROBE_SLOT_IPADDR_V6]) {
       /* we have an address, of one kind or other */
-      struct Curl_dns_entry *dns; 
-      struct Curl_addrinfo *ai; 
- 
+      struct Curl_dns_entry *dns;
+      struct Curl_addrinfo *ai;
+
       infof(data, "DOH Host name: %s\n", data->req.doh.host);
       showdoh(data, &de);
 
@@ -991,5 +991,5 @@ CURLcode Curl_doh_is_resolved(struct connectdata *conn,
   /* else wait for pending DOH transactions to complete */
   return CURLE_OK;
 }
- 
-#endif /* CURL_DISABLE_DOH */ 
+
+#endif /* CURL_DISABLE_DOH */