nobu	2008-07-23 17:48:39 +0900 (Wed, 23 Jul 2008)

  New Revision: 18183

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

  Log:
    * ext/socket/socket.c (init_inetsock_internal): suppress warnings.
    
    * ext/socket/socket.c (unixpath, sock_s_unpack_sockaddr_un),
      (sock_define_const): constified.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/socket/socket.c

Index: ruby_1_8/ext/socket/socket.c
===================================================================
--- ruby_1_8/ext/socket/socket.c	(revision 18182)
+++ ruby_1_8/ext/socket/socket.c	(revision 18183)
@@ -1224,7 +1224,7 @@
     int type = arg->type;
     struct addrinfo *res;
     int fd, status = 0;
-    char *syscall;
+    const char *syscall = 0;
 
     arg->remote.res = sock_addrinfo(arg->remote.host, arg->remote.serv, SOCK_STREAM,
 				    (type == INET_SERVER) ? AI_PASSIVE : 0);
@@ -1907,7 +1907,7 @@
     return init_unixsock(sock, path, 0);
 }
 
-static char *
+static const char *
 unixpath(struct sockaddr_un *sockaddr, socklen_t len)
 {
     if (sockaddr->sun_path < (char*)sockaddr + len)
@@ -3846,7 +3846,7 @@
     VALUE self, addr;
 {
     struct sockaddr_un * sockaddr;
-    char *sun_path;
+    const char *sun_path;
     VALUE path;
 
     sockaddr = (struct sockaddr_un*)StringValuePtr(addr);
@@ -3873,7 +3873,7 @@
 
 static void
 sock_define_const(name, value)
-    char *name;
+    const char *name;
     int value;
 {
     rb_define_const(rb_cSocket, name, INT2FIX(value));
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 18182)
+++ ruby_1_8/ChangeLog	(revision 18183)
@@ -1,3 +1,10 @@
+Wed Jul 23 17:48:37 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/socket/socket.c (init_inetsock_internal): suppress warnings.
+
+	* ext/socket/socket.c (unixpath, sock_s_unpack_sockaddr_un),
+	  (sock_define_const): constified.
+
 Wed Jul 23 17:37:25 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/zlib/zlib.c: suppress warnings.  backported r9918 and r10358.

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