ruby-changes:11100
From: akr <ko1@a...>
Date: Sun, 1 Mar 2009 23:01:00 +0900 (JST)
Subject: [ruby-changes:11100] Ruby:r22698 (trunk): * ext/socket/raddrinfo.c: suppress warnings.
akr 2009-03-01 23:00:48 +0900 (Sun, 01 Mar 2009) New Revision: 22698 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22698 Log: * ext/socket/raddrinfo.c: suppress warnings. * ext/socket/socket.c: ditto. * ext/socket/unixsocket.c: ditto. Modified files: trunk/ChangeLog trunk/ext/socket/raddrinfo.c trunk/ext/socket/socket.c trunk/ext/socket/unixsocket.c Index: ChangeLog =================================================================== --- ChangeLog (revision 22697) +++ ChangeLog (revision 22698) @@ -1,3 +1,11 @@ +Sun Mar 1 22:59:41 2009 Tanaka Akira <akr@f...> + + * ext/socket/raddrinfo.c: suppress warnings. + + * ext/socket/socket.c: ditto. + + * ext/socket/unixsocket.c: ditto. + Sun Mar 1 20:57:41 2009 Tanaka Akira <akr@f...> * ext/socket/ (rsock_getfamily): renamed from rb_sock_getfamily. Index: ext/socket/raddrinfo.c =================================================================== --- ext/socket/raddrinfo.c (revision 22697) +++ ext/socket/raddrinfo.c (revision 22698) @@ -725,7 +725,7 @@ StringValue(path); - if (sizeof(un.sun_path) <= RSTRING_LEN(path)) + if (sizeof(un.sun_path) <= (size_t)RSTRING_LEN(path)) rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)", (int)sizeof(un.sun_path)-1); @@ -1260,7 +1260,7 @@ sun.sun_family = AF_UNIX; StringValue(v); - if (sizeof(sun.sun_path) <= RSTRING_LEN(v)) + if (sizeof(sun.sun_path) <= (size_t)RSTRING_LEN(v)) rb_raise(rb_eSocket, "too long AF_UNIX path"); memcpy(sun.sun_path, RSTRING_PTR(v), RSTRING_LEN(v)); len = sizeof(sun); Index: ext/socket/socket.c =================================================================== --- ext/socket/socket.c (revision 22697) +++ ext/socket/socket.c (revision 22698) @@ -1153,11 +1153,11 @@ tmp = rb_check_sockaddr_string_type(sa); if (!NIL_P(tmp)) { sa = tmp; - if (sizeof(ss) < RSTRING_LEN(sa)) { + if (sizeof(ss) < (size_t)RSTRING_LEN(sa)) { rb_raise(rb_eTypeError, "sockaddr length too big"); } memcpy(&ss, RSTRING_PTR(sa), RSTRING_LEN(sa)); - if (RSTRING_LEN(sa) != SS_LEN(&ss)) { + if ((size_t)RSTRING_LEN(sa) != SS_LEN(&ss)) { rb_raise(rb_eTypeError, "sockaddr size differs - should not happen"); } sap = (struct sockaddr*)&ss; @@ -1386,7 +1386,7 @@ if (((struct sockaddr *)sockaddr)->sa_family != AF_UNIX) { rb_raise(rb_eArgError, "not an AF_UNIX sockaddr"); } - if (sizeof(struct sockaddr_un) < RSTRING_LEN(addr)) { + if (sizeof(struct sockaddr_un) < (size_t)RSTRING_LEN(addr)) { rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d", RSTRING_LEN(addr), (int)sizeof(struct sockaddr_un)); } Index: ext/socket/unixsocket.c =================================================================== --- ext/socket/unixsocket.c (revision 22697) +++ ext/socket/unixsocket.c (revision 22698) @@ -38,7 +38,7 @@ MEMZERO(&sockaddr, struct sockaddr_un, 1); sockaddr.sun_family = AF_UNIX; - if (sizeof(sockaddr.sun_path) <= RSTRING_LEN(path)) { + if (sizeof(sockaddr.sun_path) <= (size_t)RSTRING_LEN(path)) { rb_raise(rb_eArgError, "too long unix socket path (max: %dbytes)", (int)sizeof(sockaddr.sun_path)-1); } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/