Revert "Update to 7.40.1"

[platform/upstream/curl.git] / lib / curl_addrinfo.c

diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 1e359d5..10652c6 100644 (file)
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, 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
@@ -33,9 +33,6 @@
 #ifdef HAVE_ARPA_INET_H
 #  include <arpa/inet.h>
 #endif
-#ifdef HAVE_SYS_UN_H
-#  include <sys/un.h>
-#endif
 
 #ifdef __VMS
 #  include <in.h>
@@ -357,7 +354,7 @@ Curl_he2ai(const struct hostent *he, int port)
     prevai = ai;
   }
 
-  if(result) {
+  if(result != CURLE_OK) {
     Curl_freeaddrinfo(firstai);
     firstai = NULL;
   }
@@ -480,42 +477,6 @@ Curl_addrinfo *Curl_str2addr(char *address, int port)
   return NULL; /* bad input format */
 }
 
-#ifdef USE_UNIX_SOCKETS
-/**
- * Given a path to a Unix domain socket, return a newly allocated Curl_addrinfo
- * struct initialized with this path.
- */
-Curl_addrinfo *Curl_unix2addr(const char *path)
-{
-  Curl_addrinfo *ai;
-  struct sockaddr_un *sa_un;
-  size_t path_len;
-
-  ai = calloc(1, sizeof(Curl_addrinfo));
-  if(!ai)
-    return NULL;
-  if((ai->ai_addr = calloc(1, sizeof(struct sockaddr_un))) == NULL) {
-    free(ai);
-    return NULL;
-  }
-  /* sun_path must be able to store the NUL-terminated path */
-  path_len = strlen(path);
-  if(path_len >= sizeof(sa_un->sun_path)) {
-    free(ai->ai_addr);
-    free(ai);
-    return NULL;
-  }
-
-  ai->ai_family = AF_UNIX;
-  ai->ai_socktype = SOCK_STREAM; /* assume reliable transport for HTTP */
-  ai->ai_addrlen = (curl_socklen_t) sizeof(struct sockaddr_un);
-  sa_un = (void *) ai->ai_addr;
-  sa_un->sun_family = AF_UNIX;
-  memcpy(sa_un->sun_path, path, path_len + 1); /* copy NUL byte */
-  return ai;
-}
-#endif
-
 #if defined(CURLDEBUG) && defined(HAVE_FREEADDRINFO)
 /*
  * curl_dofreeaddrinfo()