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

1 files changed, 76 insertions, 76 deletions

diff --git a/contrib/libs/curl/lib/dict.c b/contrib/libs/curl/lib/dict.c
index cc033be0cf..15d3954aa3 100644
--- a/contrib/libs/curl/lib/dict.c
+++ b/contrib/libs/curl/lib/dict.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
@@ -46,8 +46,8 @@
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
-#elif defined(HAVE_UNISTD_H) 
-#include <unistd.h> 
+#elif defined(HAVE_UNISTD_H)
+#include <unistd.h>
 #endif
 
 #include "urldata.h"
@@ -57,7 +57,7 @@
 #include "escape.h"
 #include "progress.h"
 #include "dict.h"
-#include "curl_printf.h" 
+#include "curl_printf.h"
 #include "strcase.h"
 #include "curl_memory.h"
 /* The last #include file should be: */
@@ -91,8 +91,8 @@ const struct Curl_handler Curl_handler_dict = {
   ZERO_NULL,                            /* connection_check */
   PORT_DICT,                            /* defport */
   CURLPROTO_DICT,                       /* protocol */
-  CURLPROTO_DICT,                       /* family */ 
-  PROTOPT_NONE | PROTOPT_NOURLQUERY     /* flags */ 
+  CURLPROTO_DICT,                       /* family */
+  PROTOPT_NONE | PROTOPT_NOURLQUERY     /* flags */
 };
 
 static char *unescape_word(struct Curl_easy *data, const char *inputbuff)
@@ -101,8 +101,8 @@ static char *unescape_word(struct Curl_easy *data, const char *inputbuff)
   char *dictp;
   size_t len;
 
-  CURLcode result = Curl_urldecode(data, inputbuff, 0, &newp, &len, 
-                                   REJECT_NADA); 
+  CURLcode result = Curl_urldecode(data, inputbuff, 0, &newp, &len,
+                                   REJECT_NADA);
   if(!newp || result)
     return NULL;
 
@@ -128,51 +128,51 @@ static char *unescape_word(struct Curl_easy *data, const char *inputbuff)
   return dictp;
 }
 
-/* sendf() sends formatted data to the server */ 
-static CURLcode sendf(curl_socket_t sockfd, struct connectdata *conn, 
-                      const char *fmt, ...) 
-{ 
-  struct Curl_easy *data = conn->data; 
-  ssize_t bytes_written; 
-  size_t write_len; 
-  CURLcode result = CURLE_OK; 
-  char *s; 
-  char *sptr; 
-  va_list ap; 
-  va_start(ap, fmt); 
-  s = vaprintf(fmt, ap); /* returns an allocated string */ 
-  va_end(ap); 
-  if(!s) 
-    return CURLE_OUT_OF_MEMORY; /* failure */ 
- 
-  bytes_written = 0; 
-  write_len = strlen(s); 
-  sptr = s; 
- 
-  for(;;) { 
-    /* Write the buffer to the socket */ 
-    result = Curl_write(conn, sockfd, sptr, write_len, &bytes_written); 
- 
-    if(result) 
-      break; 
- 
-    Curl_debug(data, CURLINFO_DATA_OUT, sptr, (size_t)bytes_written); 
- 
-    if((size_t)bytes_written != write_len) { 
-      /* if not all was written at once, we must advance the pointer, decrease 
-         the size left and try again! */ 
-      write_len -= bytes_written; 
-      sptr += bytes_written; 
-    } 
-    else 
-      break; 
-  } 
- 
-  free(s); /* free the output string */ 
- 
-  return result; 
-} 
- 
+/* sendf() sends formatted data to the server */
+static CURLcode sendf(curl_socket_t sockfd, struct connectdata *conn,
+                      const char *fmt, ...)
+{
+  struct Curl_easy *data = conn->data;
+  ssize_t bytes_written;
+  size_t write_len;
+  CURLcode result = CURLE_OK;
+  char *s;
+  char *sptr;
+  va_list ap;
+  va_start(ap, fmt);
+  s = vaprintf(fmt, ap); /* returns an allocated string */
+  va_end(ap);
+  if(!s)
+    return CURLE_OUT_OF_MEMORY; /* failure */
+
+  bytes_written = 0;
+  write_len = strlen(s);
+  sptr = s;
+
+  for(;;) {
+    /* Write the buffer to the socket */
+    result = Curl_write(conn, sockfd, sptr, write_len, &bytes_written);
+
+    if(result)
+      break;
+
+    Curl_debug(data, CURLINFO_DATA_OUT, sptr, (size_t)bytes_written);
+
+    if((size_t)bytes_written != write_len) {
+      /* if not all was written at once, we must advance the pointer, decrease
+         the size left and try again! */
+      write_len -= bytes_written;
+      sptr += bytes_written;
+    }
+    else
+      break;
+  }
+
+  free(s); /* free the output string */
+
+  return result;
+}
+
 static CURLcode dict_do(struct connectdata *conn, bool *done)
 {
   char *word;
@@ -230,16 +230,16 @@ static CURLcode dict_do(struct connectdata *conn, bool *done)
     if(!eword)
       return CURLE_OUT_OF_MEMORY;
 
-    result = sendf(sockfd, conn, 
-                   "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\r\n" 
-                   "MATCH " 
-                   "%s "    /* database */ 
-                   "%s "    /* strategy */ 
-                   "%s\r\n" /* word */ 
-                   "QUIT\r\n", 
-                   database, 
-                   strategy, 
-                   eword); 
+    result = sendf(sockfd, conn,
+                   "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\r\n"
+                   "MATCH "
+                   "%s "    /* database */
+                   "%s "    /* strategy */
+                   "%s\r\n" /* word */
+                   "QUIT\r\n",
+                   database,
+                   strategy,
+                   eword);
 
     free(eword);
 
@@ -278,14 +278,14 @@ static CURLcode dict_do(struct connectdata *conn, bool *done)
     if(!eword)
       return CURLE_OUT_OF_MEMORY;
 
-    result = sendf(sockfd, conn, 
-                   "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\r\n" 
-                   "DEFINE " 
-                   "%s "     /* database */ 
-                   "%s\r\n"  /* word */ 
-                   "QUIT\r\n", 
-                   database, 
-                   eword); 
+    result = sendf(sockfd, conn,
+                   "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\r\n"
+                   "DEFINE "
+                   "%s "     /* database */
+                   "%s\r\n"  /* word */
+                   "QUIT\r\n",
+                   database,
+                   eword);
 
     free(eword);
 
@@ -306,10 +306,10 @@ static CURLcode dict_do(struct connectdata *conn, bool *done)
         if(ppath[i] == ':')
           ppath[i] = ' ';
       }
-      result = sendf(sockfd, conn, 
-                     "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\r\n" 
-                     "%s\r\n" 
-                     "QUIT\r\n", ppath); 
+      result = sendf(sockfd, conn,
+                     "CLIENT " LIBCURL_NAME " " LIBCURL_VERSION "\r\n"
+                     "%s\r\n"
+                     "QUIT\r\n", ppath);
       if(result) {
         failf(data, "Failed sending DICT request");
         return result;