Reduce VC++ compiler warnings.

2 files changed, 20 insertions, 19 deletions

diff --git a/mrbgems/mruby-pack/src/pack.c b/mrbgems/mruby-pack/src/pack.c
index 2f762398b..1709160e6 100644
--- a/mrbgems/mruby-pack/src/pack.c
+++ b/mrbgems/mruby-pack/src/pack.c
@@ -567,7 +567,7 @@ pack_a(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, long count, u
     *dptr++ = pad;
   }
 
-  return dptr - dptr0;
+  return (int)(dptr - dptr0);
 }
 
 static int
@@ -575,7 +575,7 @@ unpack_a(mrb_state *mrb, const void *src, int slen, mrb_value ary, long count, u
 {
   mrb_value dst;
   const char *cp, *sptr;
-  long copylen;
+  ptrdiff_t copylen;
 
   sptr = (const char *)src;
   if (count != -1 && count < slen)  {
@@ -596,7 +596,7 @@ unpack_a(mrb_state *mrb, const void *src, int slen, mrb_value ary, long count, u
     }
   }
 
-  dst = mrb_str_new(mrb, sptr, copylen);
+  dst = mrb_str_new(mrb, sptr, (mrb_int)copylen);
   mrb_ary_push(mrb, ary, dst);
   return slen;
 }
@@ -606,11 +606,11 @@ static int
 pack_h(mrb_state *mrb, mrb_value src, mrb_value dst, mrb_int didx, long count, unsigned int flags)
 {
   unsigned int a, ashift, b, bshift;
-  mrb_int slen;
+  long slen;
   char *dptr, *dptr0, *sptr;
 
   sptr = RSTRING_PTR(src);
-  slen = RSTRING_LEN(src);
+  slen = (long)RSTRING_LEN(src);
 
   if (flags & PACK_FLAG_LSB) {
     ashift = 0;
@@ -853,8 +853,8 @@ has_tmpl(const struct tmpl *tmpl)
 static void
 read_tmpl(mrb_state *mrb, struct tmpl *tmpl, int *dirp, int *typep, int *sizep, long *countp, unsigned int *flagsp)
 {
-  mrb_int ch, dir, t, tlen, type;
-  int size = 0;
+  mrb_int ch, t, tlen;
+  int dir, type, size = 0;
   long count = 1;
   unsigned int flags = 0;
   const char *tptr;
@@ -1044,7 +1044,7 @@ alias:
       count = -1;
     } else if (ch == '_' || ch == '!' || ch == '<' || ch == '>') {
       if (strchr("sSiIlLqQ", t) == NULL) {
-        char ch_str = ch;
+        char ch_str = (char)ch;
         mrb_raisef(mrb, E_ARGUMENT_ERROR, "'%S' allowed only after types sSiIlLqQ", mrb_str_new(mrb, &ch_str, 1));
       }
       if (ch == '_' || ch == '!') {
diff --git a/mrbgems/mruby-socket/src/socket.c b/mrbgems/mruby-socket/src/socket.c
index 4fe934d9a..4832a5b4e 100644
--- a/mrbgems/mruby-socket/src/socket.c
+++ b/mrbgems/mruby-socket/src/socket.c
@@ -330,7 +330,7 @@ mrb_basicsocket_getsockopt(mrb_state *mrb, mrb_value self)
 static mrb_value
 mrb_basicsocket_recv(mrb_state *mrb, mrb_value self)
 {
-  int n;
+  ssize_t n;
   mrb_int maxlen, flags = 0;
   mrb_value buf;
 
@@ -339,14 +339,14 @@ mrb_basicsocket_recv(mrb_state *mrb, mrb_value self)
   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);
+  mrb_str_resize(mrb, buf, (mrb_int)n);
   return buf;
 }
 
 static mrb_value
 mrb_basicsocket_recvfrom(mrb_state *mrb, mrb_value self)
 {
-  int n;
+  ssize_t n;
   mrb_int maxlen, flags = 0;
   mrb_value ary, buf, sa;
   socklen_t socklen;
@@ -358,8 +358,8 @@ mrb_basicsocket_recvfrom(mrb_state *mrb, mrb_value self)
   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);
-  mrb_str_resize(mrb, sa, socklen);
+  mrb_str_resize(mrb, buf, (mrb_int)n);
+  mrb_str_resize(mrb, sa, (mrb_int)socklen);
   ary = mrb_ary_new_capa(mrb, 2);
   mrb_ary_push(mrb, ary, buf);
   mrb_ary_push(mrb, ary, sa);
@@ -369,7 +369,7 @@ mrb_basicsocket_recvfrom(mrb_state *mrb, mrb_value self)
 static mrb_value
 mrb_basicsocket_send(mrb_state *mrb, mrb_value self)
 {
-  int n;
+  ssize_t n;
   mrb_int flags;
   mrb_value dest, mesg;
 
@@ -382,7 +382,7 @@ mrb_basicsocket_send(mrb_state *mrb, mrb_value self)
   }
   if (n == -1)
     mrb_sys_fail(mrb, "send");
-  return mrb_fixnum_value(n);
+  return mrb_fixnum_value((mrb_int)n);
 }
 
 static mrb_value
@@ -454,7 +454,7 @@ mrb_basicsocket_setsockopt(mrb_state *mrb, mrb_value self)
   }
 
   s = socket_fd(mrb, self);
-  if (setsockopt(s, (int)level, (int)optname, RSTRING_PTR(optval), (size_t)RSTRING_LEN(optval)) == -1)
+  if (setsockopt(s, (int)level, (int)optname, RSTRING_PTR(optval), (socklen_t)RSTRING_LEN(optval)) == -1)
     mrb_sys_fail(mrb, "setsockopt");
   return mrb_fixnum_value(0);
 }
@@ -521,7 +521,8 @@ mrb_ipsocket_recvfrom(mrb_state *mrb, mrb_value self)
   socklen_t socklen;
   mrb_value a, buf, pair;
   mrb_int flags, maxlen;
-  int n, fd;
+  ssize_t n;
+  int fd;
 
   fd = socket_fd(mrb, self);
   flags = 0;
@@ -533,7 +534,7 @@ mrb_ipsocket_recvfrom(mrb_state *mrb, mrb_value self)
   if (n == -1) {
     mrb_sys_fail(mrb, "recvfrom");
   }
-  mrb_str_resize(mrb, buf, n);
+  mrb_str_resize(mrb, buf, (mrb_int)n);
   a = sa2addrlist(mrb, (struct sockaddr *)&ss, socklen);
   pair = mrb_ary_new_capa(mrb, 2);
   mrb_ary_push(mrb, pair, buf);
@@ -555,7 +556,7 @@ mrb_socket_gethostname(mrb_state *mrb, mrb_value cls)
   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)));
+  mrb_str_resize(mrb, buf, (mrb_int)strlen(RSTRING_PTR(buf)));
   return buf;
 }