akr	2009-02-11 00:39:16 +0900 (Wed, 11 Feb 2009)

  New Revision: 22215

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

  Log:
    * ext/socket/socket.c (sock_gethostname): use HOST_NAME_MAX.
    * ext/socket/raddrinfo.c (make_ipaddr): local variable renamed.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/raddrinfo.c
    trunk/ext/socket/socket.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22214)
+++ ChangeLog	(revision 22215)
@@ -1,3 +1,9 @@
+Wed Feb 11 00:38:16 2009  Tanaka Akira  <akr@f...>
+
+	* ext/socket/socket.c (sock_gethostname): use HOST_NAME_MAX.
+
+	* ext/socket/raddrinfo.c (make_ipaddr): local variable renamed.
+
 Tue Feb 10 23:44:53 2009  Tanaka Akira  <akr@f...>
 
 	* ext/socket/init.c (struct recvfrom_arg): use struct
Index: ext/socket/raddrinfo.c
===================================================================
--- ext/socket/raddrinfo.c	(revision 22214)
+++ ext/socket/raddrinfo.c	(revision 22215)
@@ -193,10 +193,10 @@
 VALUE
 make_ipaddr(struct sockaddr *addr)
 {
-    char buf[1024];
+    char hbuf[1024];
 
-    make_ipaddr0(addr, buf, sizeof(buf));
-    return rb_str_new2(buf);
+    make_ipaddr0(addr, hbuf, sizeof(hbuf));
+    return rb_str_new2(hbuf);
 }
 
 static void
Index: ext/socket/socket.c
===================================================================
--- ext/socket/socket.c	(revision 22214)
+++ ext/socket/socket.c	(revision 22215)
@@ -826,7 +826,10 @@
 static VALUE
 sock_gethostname(VALUE obj)
 {
-    char buf[1024];
+#ifndef HOST_NAME_MAX
+#  define HOST_NAME_MAX 1024
+#endif
+    char buf[HOST_NAME_MAX+1];
 
     rb_secure(3);
     if (gethostname(buf, (int)sizeof buf - 1) < 0)

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