yugui	2010-07-01 11:04:54 +0900 (Thu, 01 Jul 2010)

  New Revision: 28497

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28497

  Log:
    merges r28410 from trunk into ruby_1_9_2.
    --
    * ext/socket/raddrinfo.c (str_is_number): renamed from str_isnumber to
      avoid confusion to str_isnumber in ext/socket/getaddrinfo.c.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/socket/raddrinfo.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28496)
+++ ruby_1_9_2/ChangeLog	(revision 28497)
@@ -1,3 +1,8 @@
+Wed Jun 23 23:49:21 2010  Tanaka Akira  <akr@f...>
+
+	* ext/socket/raddrinfo.c (str_is_number): renamed from str_isnumber to
+	  avoid confusion to str_isnumber in ext/socket/getaddrinfo.c.
+
 Wed Jun 23 21:32:08 2010  Masaki Suketa <masaki.suketa@n...>
 
 	* ext/win32ole/win32ole.c (reg_get_typelib_file_path): try win64
Index: ruby_1_9_2/ext/socket/raddrinfo.c
===================================================================
--- ruby_1_9_2/ext/socket/raddrinfo.c	(revision 28496)
+++ ruby_1_9_2/ext/socket/raddrinfo.c	(revision 28497)
@@ -97,7 +97,7 @@
             ruby_getnameinfo__aix((sa), (salen), (host), (hostlen), (serv), (servlen), (flags))
 #endif
 
-static int str_isnumber(const char *);
+static int str_is_number(const char *);
 
 #if defined(__APPLE__)
 /* fix [ruby-core:29427] */
@@ -110,7 +110,7 @@
     tmp_servname = servname;
     MEMCPY(&tmp_hints, hints, struct addrinfo, 1);
     if (nodename && servname) {
-	if (str_isnumber(tmp_servname) && atoi(servname) == 0) {
+	if (str_is_number(tmp_servname) && atoi(servname) == 0) {
 	    tmp_servname = NULL;
 #ifdef AI_NUMERICSERV
 	    if (tmp_hints.ai_flags) tmp_hints.ai_flags &= ~AI_NUMERICSERV;
@@ -239,7 +239,7 @@
 }
 
 static int
-str_isnumber(const char *p)
+str_is_number(const char *p)
 {
     char *ep;
 
@@ -329,7 +329,7 @@
     hostp = host_str(host, hbuf, sizeof(hbuf), &additional_flags);
     portp = port_str(port, pbuf, sizeof(pbuf), &additional_flags);
 
-    if (socktype_hack && hints->ai_socktype == 0 && str_isnumber(portp)) {
+    if (socktype_hack && hints->ai_socktype == 0 && str_is_number(portp)) {
        hints->ai_socktype = SOCK_DGRAM;
     }
     hints->ai_flags |= additional_flags;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/