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

1 files changed, 72 insertions, 72 deletions

diff --git a/contrib/libs/curl/lib/if2ip.c b/contrib/libs/curl/lib/if2ip.c
index 83ae2cf5a00..bf397aad457 100644
--- a/contrib/libs/curl/lib/if2ip.c
+++ b/contrib/libs/curl/lib/if2ip.c
@@ -48,54 +48,54 @@
 #endif
 
 #include "inet_ntop.h"
-#include "strcase.h" 
+#include "strcase.h"
 #include "if2ip.h"
-/* The last 3 #include files should be in this order */ 
-#include "curl_printf.h" 
+/* The last 3 #include files should be in this order */
+#include "curl_printf.h"
 #include "curl_memory.h"
 #include "memdebug.h"
 
 /* ------------------------------------------------------------------ */
 
-/* Return the scope of the given address. */ 
-unsigned int Curl_ipv6_scope(const struct sockaddr *sa) 
-{ 
-#ifndef ENABLE_IPV6 
-  (void) sa; 
-#else 
-  if(sa->sa_family == AF_INET6) { 
-    const struct sockaddr_in6 * sa6 = (const struct sockaddr_in6 *)(void *) sa; 
-    const unsigned char *b = sa6->sin6_addr.s6_addr; 
-    unsigned short w = (unsigned short) ((b[0] << 8) | b[1]); 
- 
-    if((b[0] & 0xFE) == 0xFC) /* Handle ULAs */ 
-      return IPV6_SCOPE_UNIQUELOCAL; 
-    switch(w & 0xFFC0) { 
-    case 0xFE80: 
-      return IPV6_SCOPE_LINKLOCAL; 
-    case 0xFEC0: 
-      return IPV6_SCOPE_SITELOCAL; 
-    case 0x0000: 
-      w = b[1] | b[2] | b[3] | b[4] | b[5] | b[6] | b[7] | b[8] | b[9] | 
-          b[10] | b[11] | b[12] | b[13] | b[14]; 
-      if(w || b[15] != 0x01) 
-        break; 
-      return IPV6_SCOPE_NODELOCAL; 
-    default: 
-      break; 
-    } 
-  } 
-#endif 
- 
-  return IPV6_SCOPE_GLOBAL; 
-} 
- 
- 
+/* Return the scope of the given address. */
+unsigned int Curl_ipv6_scope(const struct sockaddr *sa)
+{
+#ifndef ENABLE_IPV6
+  (void) sa;
+#else
+  if(sa->sa_family == AF_INET6) {
+    const struct sockaddr_in6 * sa6 = (const struct sockaddr_in6 *)(void *) sa;
+    const unsigned char *b = sa6->sin6_addr.s6_addr;
+    unsigned short w = (unsigned short) ((b[0] << 8) | b[1]);
+
+    if((b[0] & 0xFE) == 0xFC) /* Handle ULAs */
+      return IPV6_SCOPE_UNIQUELOCAL;
+    switch(w & 0xFFC0) {
+    case 0xFE80:
+      return IPV6_SCOPE_LINKLOCAL;
+    case 0xFEC0:
+      return IPV6_SCOPE_SITELOCAL;
+    case 0x0000:
+      w = b[1] | b[2] | b[3] | b[4] | b[5] | b[6] | b[7] | b[8] | b[9] |
+          b[10] | b[11] | b[12] | b[13] | b[14];
+      if(w || b[15] != 0x01)
+        break;
+      return IPV6_SCOPE_NODELOCAL;
+    default:
+      break;
+    }
+  }
+#endif
+
+  return IPV6_SCOPE_GLOBAL;
+}
+
+
 #if defined(HAVE_GETIFADDRS)
 
 if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
                           unsigned int local_scope_id, const char *interf,
-                          char *buf, int buf_size) 
+                          char *buf, int buf_size)
 {
   struct ifaddrs *iface, *head;
   if2ip_result_t res = IF2IP_NOT_FOUND;
@@ -104,28 +104,28 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
   (void) remote_scope;
 #endif
 
-#if !defined(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID) || \ 
-    !defined(ENABLE_IPV6) 
+#if !defined(HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID) || \
+    !defined(ENABLE_IPV6)
   (void) local_scope_id;
-#endif 
- 
+#endif
+
   if(getifaddrs(&head) >= 0) {
-    for(iface = head; iface != NULL; iface = iface->ifa_next) { 
+    for(iface = head; iface != NULL; iface = iface->ifa_next) {
       if(iface->ifa_addr != NULL) {
         if(iface->ifa_addr->sa_family == af) {
-          if(strcasecompare(iface->ifa_name, interf)) { 
+          if(strcasecompare(iface->ifa_name, interf)) {
             void *addr;
             const char *ip;
-            char scope[12] = ""; 
+            char scope[12] = "";
             char ipstr[64];
 #ifdef ENABLE_IPV6
             if(af == AF_INET6) {
 #ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
               unsigned int scopeid = 0;
 #endif
-              unsigned int ifscope = Curl_ipv6_scope(iface->ifa_addr); 
- 
-              if(ifscope != remote_scope) { 
+              unsigned int ifscope = Curl_ipv6_scope(iface->ifa_addr);
+
+              if(ifscope != remote_scope) {
                 /* We are interested only in interface addresses whose scope
                    matches the remote address we want to connect to: global
                    for global, link-local for link-local, etc... */
@@ -133,46 +133,46 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
                   res = IF2IP_AF_NOT_SUPPORTED;
                 continue;
               }
- 
-              addr = 
-                &((struct sockaddr_in6 *)(void *)iface->ifa_addr)->sin6_addr; 
-#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 
-              /* Include the scope of this interface as part of the address */ 
-              scopeid = ((struct sockaddr_in6 *)(void *)iface->ifa_addr) 
-                            ->sin6_scope_id; 
- 
-              /* If given, scope id should match. */ 
+
+              addr =
+                &((struct sockaddr_in6 *)(void *)iface->ifa_addr)->sin6_addr;
+#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
+              /* Include the scope of this interface as part of the address */
+              scopeid = ((struct sockaddr_in6 *)(void *)iface->ifa_addr)
+                            ->sin6_scope_id;
+
+              /* If given, scope id should match. */
               if(local_scope_id && scopeid != local_scope_id) {
-                if(res == IF2IP_NOT_FOUND) 
-                  res = IF2IP_AF_NOT_SUPPORTED; 
- 
-                continue; 
-              } 
+                if(res == IF2IP_NOT_FOUND)
+                  res = IF2IP_AF_NOT_SUPPORTED;
+
+                continue;
+              }
 
               if(scopeid)
                 msnprintf(scope, sizeof(scope), "%%%u", scopeid);
-#endif 
+#endif
             }
             else
 #endif
-              addr = 
+              addr =
                 &((struct sockaddr_in *)(void *)iface->ifa_addr)->sin_addr;
             res = IF2IP_FOUND;
             ip = Curl_inet_ntop(af, addr, ipstr, sizeof(ipstr));
-            msnprintf(buf, buf_size, "%s%s", ip, scope); 
+            msnprintf(buf, buf_size, "%s%s", ip, scope);
             break;
           }
         }
         else if((res == IF2IP_NOT_FOUND) &&
-                strcasecompare(iface->ifa_name, interf)) { 
+                strcasecompare(iface->ifa_name, interf)) {
           res = IF2IP_AF_NOT_SUPPORTED;
         }
       }
     }
- 
+
     freeifaddrs(head);
   }
- 
+
   return res;
 }
 
@@ -180,7 +180,7 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
 
 if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
                           unsigned int local_scope_id, const char *interf,
-                          char *buf, int buf_size) 
+                          char *buf, int buf_size)
 {
   struct ifreq req;
   struct in_addr in;
@@ -204,7 +204,7 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
     return IF2IP_NOT_FOUND;
 
   memset(&req, 0, sizeof(req));
-  memcpy(req.ifr_name, interf, len + 1); 
+  memcpy(req.ifr_name, interf, len + 1);
   req.ifr_addr.sa_family = AF_INET;
 
   if(ioctl(dummy, SIOCGIFADDR, &req) < 0) {
@@ -215,7 +215,7 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
     return IF2IP_NOT_FOUND;
   }
 
-  s = (struct sockaddr_in *)(void *)&req.ifr_addr; 
+  s = (struct sockaddr_in *)(void *)&req.ifr_addr;
   memcpy(&in, &s->sin_addr, sizeof(in));
   r = Curl_inet_ntop(s->sin_family, &in, buf, buf_size);
 
@@ -229,7 +229,7 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
 
 if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
                           unsigned int local_scope_id, const char *interf,
-                          char *buf, int buf_size) 
+                          char *buf, int buf_size)
 {
     (void) af;
     (void) remote_scope;