From 7bca2f031ae387f979397f73640f0c5b07dc313d Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 11 Jul 2012 03:17:35 +0000 Subject: get rid of warnings * io.c (sysopen_func, rb_sysopen_internal): cast through VALUE to get rid of warnings. fixup of r36355. * process.c (rb_waitpid_blocking, rb_waitpid): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/ossl_pkey_ec.c | 4 ++-- ext/socket/raddrinfo.c | 16 ++++++++-------- ext/zlib/zlib.c | 13 ++++++------- 3 files changed, 16 insertions(+), 17 deletions(-) (limited to 'ext') diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c index 487fb1bac3..08b875f603 100644 --- a/ext/openssl/ossl_pkey_ec.c +++ b/ext/openssl/ossl_pkey_ec.c @@ -1509,7 +1509,7 @@ static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self) Check_Type(bn_v1, T_ARRAY); bignums_len = RARRAY_LEN(bn_v1); - bignums = (const BIGNUM **)OPENSSL_malloc(bignums_len * sizeof(BIGNUM *)); + bignums = (const BIGNUM **)OPENSSL_malloc(bignums_len * (int)sizeof(BIGNUM *)); for (i = 0; i < bignums_len; ++i) { bignums[i] = GetBNPtr(rb_ary_entry(bn_v1, i)); @@ -1522,7 +1522,7 @@ static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self) rb_ary_unshift(points_v, self); points_len = RARRAY_LEN(points_v); - points = (const EC_POINT **)OPENSSL_malloc(points_len * sizeof(EC_POINT *)); + points = (const EC_POINT **)OPENSSL_malloc(points_len * (int)sizeof(EC_POINT *)); for (i = 0; i < points_len; ++i) { Get_EC_POINT(rb_ary_entry(points_v, i), points[i]); diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index f37c87bc5e..eeb7f78f45 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -158,8 +158,8 @@ static void * nogvl_getaddrinfo(void *arg) { struct getaddrinfo_arg *ptr = arg; - return (void *)getaddrinfo(ptr->node, ptr->service, - ptr->hints, ptr->res); + return (void *)(VALUE)getaddrinfo(ptr->node, ptr->service, + ptr->hints, ptr->res); } #endif @@ -178,7 +178,7 @@ rb_getaddrinfo(const char *node, const char *service, arg.service = service; arg.hints = hints; arg.res = res; - ret = (int)rb_thread_call_without_gvl(nogvl_getaddrinfo, &arg, RUBY_UBF_IO, 0); + ret = (int)(VALUE)rb_thread_call_without_gvl(nogvl_getaddrinfo, &arg, RUBY_UBF_IO, 0); return ret; #endif } @@ -199,10 +199,10 @@ static void * nogvl_getnameinfo(void *arg) { struct getnameinfo_arg *ptr = arg; - return (void *)getnameinfo(ptr->sa, ptr->salen, - ptr->host, (socklen_t)ptr->hostlen, - ptr->serv, (socklen_t)ptr->servlen, - ptr->flags); + return (void *)(VALUE)getnameinfo(ptr->sa, ptr->salen, + ptr->host, (socklen_t)ptr->hostlen, + ptr->serv, (socklen_t)ptr->servlen, + ptr->flags); } #endif @@ -223,7 +223,7 @@ rb_getnameinfo(const struct sockaddr *sa, socklen_t salen, arg.serv = serv; arg.servlen = servlen; arg.flags = flags; - ret = (int)rb_thread_call_without_gvl(nogvl_getnameinfo, &arg, RUBY_UBF_IO, 0); + ret = (int)(VALUE)rb_thread_call_without_gvl(nogvl_getnameinfo, &arg, RUBY_UBF_IO, 0); return ret; #endif } diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index e2b4f44c90..ae8536b7d1 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -695,7 +695,7 @@ zstream_expand_buffer_protect(void *ptr) rb_protect((VALUE (*)(VALUE))zstream_expand_buffer, (VALUE)z, &state); - return (void *)state; + return (void *)(VALUE)state; } static int @@ -991,8 +991,8 @@ zstream_run_func(void *ptr) } if (args->stream_output) { - state = (int)rb_thread_call_with_gvl(zstream_expand_buffer_protect, - (void *)z); + state = (int)(VALUE)rb_thread_call_with_gvl(zstream_expand_buffer_protect, + (void *)z); } else { state = zstream_expand_buffer_without_gvl(z); } @@ -1004,7 +1004,7 @@ zstream_run_func(void *ptr) } } - return (void *)err; + return (void *)(VALUE)err; } /* @@ -1050,9 +1050,8 @@ zstream_run(struct zstream *z, Bytef *src, long len, int flush) } loop: - err = (int)rb_thread_call_without_gvl( - zstream_run_func, (void *)&args, - zstream_unblock_func, (void *)&args); + err = (int)(VALUE)rb_thread_call_without_gvl(zstream_run_func, (void *)&args, + zstream_unblock_func, (void *)&args); if (flush != Z_FINISH && err == Z_BUF_ERROR && z->stream.avail_out > 0) { -- cgit v1.2.3