diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-12-09 16:14:12 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-12-09 16:14:12 +0900 |
| commit | 274884abe51d22aac673d37d11ebf22ce92b8d98 (patch) | |
| tree | 6dca20a6dbd30c4ac46a46949d9a4bdefcf2046c /mrbgems/mruby-socket/src/socket.c | |
| parent | 761218e70b99c9f42008692f70d2f3cd8551b76e (diff) | |
| download | mruby-274884abe51d22aac673d37d11ebf22ce92b8d98.tar.gz mruby-274884abe51d22aac673d37d11ebf22ce92b8d98.zip | |
Reduce VC++ compiler warnings.
Diffstat (limited to 'mrbgems/mruby-socket/src/socket.c')
| -rw-r--r-- | mrbgems/mruby-socket/src/socket.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/mrbgems/mruby-socket/src/socket.c b/mrbgems/mruby-socket/src/socket.c index ff8980139..4fe934d9a 100644 --- a/mrbgems/mruby-socket/src/socket.c +++ b/mrbgems/mruby-socket/src/socket.c @@ -131,14 +131,14 @@ mrb_addrinfo_getaddrinfo(mrb_state *mrb, mrb_value klass) } memset(&hints, 0, sizeof(hints)); - hints.ai_flags = flags; + hints.ai_flags = (int)flags; if (mrb_fixnum_p(family)) { - hints.ai_family = mrb_fixnum(family); + hints.ai_family = (int)mrb_fixnum(family); } if (mrb_fixnum_p(socktype)) { - hints.ai_socktype = mrb_fixnum(socktype); + hints.ai_socktype = (int)mrb_fixnum(socktype); } lastai = mrb_cv_get(mrb, klass, mrb_intern_lit(mrb, "_lastai")); @@ -182,7 +182,7 @@ mrb_addrinfo_getnameinfo(mrb_state *mrb, mrb_value self) if (!mrb_string_p(sastr)) { mrb_raise(mrb, E_SOCKET_ERROR, "invalid sockaddr"); } - error = getnameinfo((struct sockaddr *)RSTRING_PTR(sastr), (socklen_t)RSTRING_LEN(sastr), RSTRING_PTR(host), NI_MAXHOST, RSTRING_PTR(serv), NI_MAXSERV, flags); + error = getnameinfo((struct sockaddr *)RSTRING_PTR(sastr), (socklen_t)RSTRING_LEN(sastr), RSTRING_PTR(host), NI_MAXHOST, RSTRING_PTR(serv), NI_MAXSERV, (int)flags); if (error != 0) { mrb_raisef(mrb, E_SOCKET_ERROR, "getnameinfo: %s", gai_strerror(error)); } @@ -243,7 +243,7 @@ sa2addrlist(mrb_state *mrb, const struct sockaddr *sa, socklen_t salen) static int socket_fd(mrb_state *mrb, mrb_value sock) { - return mrb_fixnum(mrb_funcall(mrb, sock, "fileno", 0)); + return (int)mrb_fixnum(mrb_funcall(mrb, sock, "fileno", 0)); } static int @@ -319,7 +319,7 @@ mrb_basicsocket_getsockopt(mrb_state *mrb, mrb_value self) mrb_get_args(mrb, "ii", &level, &optname); s = socket_fd(mrb, self); optlen = sizeof(opt); - if (getsockopt(s, level, optname, opt, &optlen) == -1) + if (getsockopt(s, (int)level, (int)optname, opt, &optlen) == -1) mrb_sys_fail(mrb, "getsockopt"); c = mrb_const_get(mrb, mrb_obj_value(mrb_class_get(mrb, "Socket")), mrb_intern_lit(mrb, "Option")); family = socket_family(s); @@ -336,7 +336,7 @@ mrb_basicsocket_recv(mrb_state *mrb, mrb_value self) mrb_get_args(mrb, "i|i", &maxlen, &flags); buf = mrb_str_buf_new(mrb, maxlen); - n = recv(socket_fd(mrb, self), RSTRING_PTR(buf), maxlen, flags); + n = recv(socket_fd(mrb, self), RSTRING_PTR(buf), (size_t)maxlen, (int)flags); if (n == -1) mrb_sys_fail(mrb, "recv"); mrb_str_resize(mrb, buf, n); @@ -355,7 +355,7 @@ mrb_basicsocket_recvfrom(mrb_state *mrb, mrb_value self) buf = mrb_str_buf_new(mrb, maxlen); socklen = sizeof(struct sockaddr_storage); sa = mrb_str_buf_new(mrb, socklen); - n = recvfrom(socket_fd(mrb, self), RSTRING_PTR(buf), maxlen, flags, (struct sockaddr *)RSTRING_PTR(sa), &socklen); + n = recvfrom(socket_fd(mrb, self), RSTRING_PTR(buf), (size_t)maxlen, (int)flags, (struct sockaddr *)RSTRING_PTR(sa), &socklen); if (n == -1) mrb_sys_fail(mrb, "recvfrom"); mrb_str_resize(mrb, buf, n); @@ -376,9 +376,9 @@ mrb_basicsocket_send(mrb_state *mrb, mrb_value self) dest = mrb_nil_value(); mrb_get_args(mrb, "Si|S", &mesg, &flags, &dest); if (mrb_nil_p(dest)) { - n = send(socket_fd(mrb, self), RSTRING_PTR(mesg), RSTRING_LEN(mesg), flags); + n = send(socket_fd(mrb, self), RSTRING_PTR(mesg), (size_t)RSTRING_LEN(mesg), (int)flags); } else { - n = sendto(socket_fd(mrb, self), RSTRING_PTR(mesg), RSTRING_LEN(mesg), flags, (const struct sockaddr*)RSTRING_PTR(dest), RSTRING_LEN(dest)); + n = sendto(socket_fd(mrb, self), RSTRING_PTR(mesg), (size_t)RSTRING_LEN(mesg), (int)flags, (const struct sockaddr*)RSTRING_PTR(dest), RSTRING_LEN(dest)); } if (n == -1) mrb_sys_fail(mrb, "send"); @@ -417,8 +417,8 @@ mrb_basicsocket_setnonblock(mrb_state *mrb, mrb_value self) static mrb_value mrb_basicsocket_setsockopt(mrb_state *mrb, mrb_value self) { - int argc, s; - mrb_int level = 0, optname; + int s; + mrb_int argc, level = 0, optname; mrb_value optval, so; argc = mrb_get_args(mrb, "o|io", &so, &optname, &optval); @@ -434,7 +434,7 @@ mrb_basicsocket_setsockopt(mrb_state *mrb, mrb_value self) optval = mrb_str_new(mrb, (char*)&i, sizeof(i)); } else if (mrb_fixnum_p(optval)) { if (optname == IP_MULTICAST_TTL || optname == IP_MULTICAST_LOOP) { - char uc = mrb_fixnum(optval); + char uc = (char)mrb_fixnum(optval); optval = mrb_str_new(mrb, &uc, sizeof(uc)); } else { mrb_int i = mrb_fixnum(optval); @@ -454,7 +454,7 @@ mrb_basicsocket_setsockopt(mrb_state *mrb, mrb_value self) } s = socket_fd(mrb, self); - if (setsockopt(s, level, optname, RSTRING_PTR(optval), RSTRING_LEN(optval)) == -1) + if (setsockopt(s, (int)level, (int)optname, RSTRING_PTR(optval), (size_t)RSTRING_LEN(optval)) == -1) mrb_sys_fail(mrb, "setsockopt"); return mrb_fixnum_value(0); } @@ -465,7 +465,7 @@ mrb_basicsocket_shutdown(mrb_state *mrb, mrb_value self) mrb_int how = SHUT_RDWR; mrb_get_args(mrb, "|i", &how); - if (shutdown(socket_fd(mrb, self), how) != 0) + if (shutdown(socket_fd(mrb, self), (int)how) != 0) mrb_sys_fail(mrb, "shutdown"); return mrb_fixnum_value(0); } @@ -479,7 +479,7 @@ mrb_ipsocket_ntop(mrb_state *mrb, mrb_value klass) mrb_get_args(mrb, "is", &af, &addr, &n); if ((af == AF_INET && n != 4) || (af == AF_INET6 && n != 16)) mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid address"); - if (inet_ntop(af, addr, buf, sizeof(buf)) == NULL) + if (inet_ntop((int)af, addr, buf, sizeof(buf)) == NULL) mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid address"); return mrb_str_new_cstr(mrb, buf); } @@ -520,15 +520,15 @@ mrb_ipsocket_recvfrom(mrb_state *mrb, mrb_value self) struct sockaddr_storage ss; socklen_t socklen; mrb_value a, buf, pair; - mrb_int flags, maxlen, n; - int fd; + mrb_int flags, maxlen; + int n, fd; fd = socket_fd(mrb, self); flags = 0; mrb_get_args(mrb, "i|i", &maxlen, &flags); buf = mrb_str_buf_new(mrb, maxlen); socklen = sizeof(ss); - n = recvfrom(fd, RSTRING_PTR(buf), maxlen, flags, + n = recvfrom(fd, RSTRING_PTR(buf), (size_t)maxlen, (int)flags, (struct sockaddr *)&ss, &socklen); if (n == -1) { mrb_sys_fail(mrb, "recvfrom"); @@ -552,7 +552,7 @@ mrb_socket_gethostname(mrb_state *mrb, mrb_value cls) #else bufsize = 256; #endif - buf = mrb_str_buf_new(mrb, bufsize); + buf = mrb_str_buf_new(mrb, (mrb_int)bufsize); if (gethostname(RSTRING_PTR(buf), bufsize) != 0) mrb_sys_fail(mrb, "gethostname"); mrb_str_resize(mrb, buf, strlen(RSTRING_PTR(buf))); @@ -692,7 +692,7 @@ mrb_socket_socket(mrb_state *mrb, mrb_value klass) int s; mrb_get_args(mrb, "iii", &domain, &type, &protocol); - s = (int)socket(domain, type, protocol); + s = (int)socket((int)domain, (int)type, (int)protocol); if (s == -1) mrb_sys_fail(mrb, "socket"); return mrb_fixnum_value(s); |
