* ext/socket/sockport.h (INIT_SOCKADDR_IN): don't need family

argument.  it is always AF_INET.

* ext/socket/raddrinfo.c (make_inetaddr): follow INIT_SOCKADDR_IN
  change.
  (addrinfo_ipv6_to_ipv4): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,12 @@
+Sat Feb 16 07:05:59 2013  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/sockport.h (INIT_SOCKADDR_IN): don't need family
+	  argument.  it is always AF_INET.
+
+	* ext/socket/raddrinfo.c (make_inetaddr): follow INIT_SOCKADDR_IN
+	  change.
+	  (addrinfo_ipv6_to_ipv4): ditto.
+
 Sat Feb 16 04:21:07 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/socket/extconf.rb: workaround for mswin/mingw build problem.

ext/socket/raddrinfo.c

@@ -253,7 +253,7 @@ make_inetaddr(unsigned int host, char *buf, size_t buflen)
 {
     struct sockaddr_in sin;
 
-    INIT_SOCKADDR_IN(&sin, AF_INET, sizeof(sin));
+    INIT_SOCKADDR_IN(&sin, sizeof(sin));
     sin.sin_addr.s_addr = host;
     make_ipaddr0((struct sockaddr*)&sin, sizeof(sin), buf, buflen);
 }
@@ -1929,7 +1929,7 @@ addrinfo_ipv6_to_ipv4(VALUE self)
     addr = &((struct sockaddr_in6 *)&rai->addr)->sin6_addr;
     if (IN6_IS_ADDR_V4MAPPED(addr) || IN6_IS_ADDR_V4COMPAT(addr)) {
         struct sockaddr_in sin4;
-        INIT_SOCKADDR_IN(&sin4, AF_INET, sizeof(sin4));
+        INIT_SOCKADDR_IN(&sin4, sizeof(sin4));
         memcpy(&sin4.sin_addr, (char*)addr + sizeof(*addr) - sizeof(sin4.sin_addr), sizeof(sin4.sin_addr));
         return rsock_addrinfo_new((struct sockaddr *)&sin4, (socklen_t)sizeof(sin4),
                                   PF_INET, rai->socktype, rai->protocol,

ext/socket/sockport.h

@@ -38,12 +38,12 @@
     SET_SA_LEN(init_sockaddr_ptr, init_sockaddr_len); \
   } while (0)
 
-#define INIT_SOCKADDR_IN(addr, family, len) \
+#define INIT_SOCKADDR_IN(addr, len) \
   do { \
     struct sockaddr_in *init_sockaddr_ptr = (addr); \
     socklen_t init_sockaddr_len = (len); \
     memset(init_sockaddr_ptr, 0, init_sockaddr_len); \
-    init_sockaddr_ptr->sin_family = (family); \
+    init_sockaddr_ptr->sin_family = AF_INET; \
     SET_SIN_LEN(init_sockaddr_ptr, init_sockaddr_len); \
   } while (0)