From 459b72604e6e0811a521bc719dcb903a2920899f Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 16 Oct 2009 04:36:31 +0000 Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@25365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/raddrinfo.c | 2 +- ext/socket/socket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/socket') diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 21cc953e1..0bf0e7e14 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 a2e14b32d..122ed7056 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 -- cgit