wanabe	2010-09-23 21:42:49 +0900 (Thu, 23 Sep 2010)

  New Revision: 29323

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

  Log:
    * ext/socket/raddrinfo.c (init_addrinfo, inspect_sockaddr): suppress
      warnings.  see [ruby-core:31932].

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29322)
+++ ChangeLog	(revision 29323)
@@ -1,3 +1,8 @@
+Thu Sep 23 21:40:40 2010  wanabe  <s.wanabe@g...>
+
+	* ext/socket/raddrinfo.c (init_addrinfo, inspect_sockaddr): suppress
+	  warnings.  see [ruby-core:31932].
+
 Thu Sep 23 19:27:57 2010  wanabe  <s.wanabe@g...>
 
 	* thread_win32.c (w32_wait_events, w32_close_handle): suppress warnings.
Index: ext/socket/raddrinfo.c
===================================================================
--- ext/socket/raddrinfo.c	(revision 29322)
+++ ext/socket/raddrinfo.c	(revision 29323)
@@ -579,7 +579,7 @@
               int pfamily, int socktype, int protocol,
               VALUE canonname, VALUE inspectname)
 {
-    if (sizeof(rai->addr) < len)
+    if ((socklen_t)sizeof(rai->addr) < len)
         rb_raise(rb_eArgError, "sockaddr string too big");
     memcpy((void *)&rai->addr, (void *)sa, len);
     rai->sockaddr_len = len;
@@ -937,7 +937,7 @@
           {
             struct sockaddr_in *addr;
             int port;
-            if (rai->sockaddr_len < sizeof(struct sockaddr_in)) {
+            if (rai->sockaddr_len < (socklen_t)sizeof(struct sockaddr_in)) {
                 rb_str_cat2(ret, "too-short-AF_INET-sockaddr");
             }
             else {
@@ -950,7 +950,7 @@
                 port = ntohs(addr->sin_port);
                 if (port)
                     rb_str_catf(ret, ":%d", port);
-                if (sizeof(struct sockaddr_in) < rai->sockaddr_len)
+                if ((socklen_t)sizeof(struct sockaddr_in) < rai->sockaddr_len)
                     rb_str_catf(ret, "(sockaddr %d bytes too long)", (int)(rai->sockaddr_len - sizeof(struct sockaddr_in)));
             }
             break;
@@ -963,7 +963,7 @@
             char hbuf[1024];
             int port;
             int error;
-            if (rai->sockaddr_len < sizeof(struct sockaddr_in6)) {
+            if (rai->sockaddr_len < (socklen_t)sizeof(struct sockaddr_in6)) {
                 rb_str_cat2(ret, "too-short-AF_INET6-sockaddr");
             }
             else {
@@ -985,7 +985,7 @@
                     port = ntohs(addr->sin6_port);
                     rb_str_catf(ret, "[%s]:%d", hbuf, port);
                 }
-                if (sizeof(struct sockaddr_in6) < rai->sockaddr_len)
+                if ((socklen_t)sizeof(struct sockaddr_in6) < rai->sockaddr_len)
                     rb_str_catf(ret, "(sockaddr %d bytes too long)", (int)(rai->sockaddr_len - sizeof(struct sockaddr_in6)));
             }
             break;

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