diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-16 04:36:31 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-16 04:36:31 +0000 |
| commit | 438b8706a7b4353a2208debaaf2fa2335ea94b1a (patch) | |
| tree | b8b497be9818d3dca50fc2d178f58f933df3e10a /ext/socket | |
| parent | b4a9962e85b8b58090f579b9cd9c0f593460f70c (diff) | |
* ext/bigdecimal/bigdecimal.c (VpMidRound): remove warnings.
patch from Charlie Savage. [ruby-core:22869]
* ext/digest/bubblebabble/bubblebabble.c (bubblebabble_str_new): ditto.
* ext/digest/digest.c (hexencode_str_new): ditto.
* ext/iconv/iconv.c (iconv_convert): ditto.
* ext/socket/socket.c (inspect_sockaddr): ditto.
* ext/socket/raddrinfo.c (sockaddr_obj): ditto.
* ext/syck/emitter.c (syck_emitter_write): ditto.
* ext/syck/emitter.c (syck_emitter_flush): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/raddrinfo.c | 2 | ||||
| -rw-r--r-- | ext/socket/socket.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 21cc953e1f..0bf0e7e14c 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -887,7 +887,7 @@ inspect_sockaddr(VALUE addrinfo, VALUE ret) if (rai->sockaddr_len == 0) { rb_str_cat2(ret, "empty-sockaddr"); } - else if (rai->sockaddr_len < ((char*)&rai->addr.ss_family + sizeof(rai->addr.ss_family)) - (char*)&rai->addr) + else if ((long)rai->sockaddr_len < ((char*)&rai->addr.ss_family + sizeof(rai->addr.ss_family)) - (char*)&rai->addr) rb_str_cat2(ret, "too-short-sockaddr"); else { switch (rai->addr.ss_family) { diff --git a/ext/socket/socket.c b/ext/socket/socket.c index a2e14b32d2..122ed70561 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -1458,7 +1458,7 @@ sockaddr_obj(struct sockaddr *addr) break; } #ifdef SA_LEN - if (len < SA_LEN(addr)) + if (len < (socklen_t)SA_LEN(addr)) len = SA_LEN(addr); #endif |