Fix `mrb_int` and `size_t` combination warnings.

5 files changed, 22 insertions, 20 deletions

diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y
index 23fad6e8a..3ae2022cf 100644
--- a/mrbgems/mruby-compiler/core/parse.y
+++ b/mrbgems/mruby-compiler/core/parse.y
@@ -6380,7 +6380,7 @@ MRB_API void
 mrb_parser_set_filename(struct mrb_parser_state *p, const char *f)
 {
   mrb_sym sym;
-  size_t i;
+  uint16_t i;
   mrb_sym* new_table;
 
   sym = mrb_intern_cstr(p->mrb, f);
@@ -6389,7 +6389,7 @@ mrb_parser_set_filename(struct mrb_parser_state *p, const char *f)
 
   for (i = 0; i < p->filename_table_length; ++i) {
     if (p->filename_table[i] == sym) {
-      p->current_filename_index = (int)i;
+      p->current_filename_index = i;
       return;
     }
   }
diff --git a/mrbgems/mruby-compiler/core/y.tab.c b/mrbgems/mruby-compiler/core/y.tab.c
index a22846e75..d9a7b72de 100644
--- a/mrbgems/mruby-compiler/core/y.tab.c
+++ b/mrbgems/mruby-compiler/core/y.tab.c
@@ -12177,7 +12177,7 @@ MRB_API void
 mrb_parser_set_filename(struct mrb_parser_state *p, const char *f)
 {
   mrb_sym sym;
-  size_t i;
+  uint16_t i;
   mrb_sym* new_table;
 
   sym = mrb_intern_cstr(p->mrb, f);
@@ -12186,7 +12186,7 @@ mrb_parser_set_filename(struct mrb_parser_state *p, const char *f)
 
   for (i = 0; i < p->filename_table_length; ++i) {
     if (p->filename_table[i] == sym) {
-      p->current_filename_index = (int)i;
+      p->current_filename_index = i;
       return;
     }
   }
diff --git a/mrbgems/mruby-os-memsize/src/memsize.c b/mrbgems/mruby-os-memsize/src/memsize.c
index 65020c97f..191ab062d 100644
--- a/mrbgems/mruby-os-memsize/src/memsize.c
+++ b/mrbgems/mruby-os-memsize/src/memsize.c
@@ -11,16 +11,18 @@
 #include <mruby/value.h>
 #include <mruby/range.h>
 
-static mrb_int
+static size_t
 os_memsize_of_ivars(mrb_state* mrb, mrb_value obj)
 {
   return mrb_obj_iv_tbl_memsize(mrb, obj);
 }
 
-static mrb_int
+static size_t
 os_memsize_of_irep(mrb_state* state, const struct mrb_irep *irep)
 {
-  mrb_int size, i;
+  size_t size;
+  int i;
+
   size = (irep->slen * sizeof(mrb_sym)) +
          (irep->plen * sizeof(mrb_code)) +
          (irep->ilen * sizeof(mrb_code));
@@ -31,10 +33,10 @@ os_memsize_of_irep(mrb_state* state, const struct mrb_irep *irep)
   return size;
 }
 
-static mrb_int
+static size_t
 os_memsize_of_method(mrb_state* mrb, mrb_value method_obj)
 {
-  mrb_int size;
+  size_t size;
   mrb_value proc_value = mrb_obj_iv_get(mrb, mrb_obj_ptr(method_obj),
                                         mrb_intern_lit(mrb, "_proc"));
   struct RProc *proc = mrb_proc_ptr(proc_value);
@@ -57,10 +59,10 @@ obj_is_kind_of_checked(mrb_state *mrb, mrb_value obj, const char *classname)
   return FALSE;
 }
 
-static mrb_int
+static size_t
 os_memsize_of_object(mrb_state* mrb, mrb_value obj)
 {
-  mrb_int size = 0;
+  size_t size = 0;
 
   switch(mrb_type(obj)) {
     case MRB_TT_STRING:
@@ -178,17 +180,17 @@ os_memsize_of_object(mrb_state* mrb, mrb_value obj)
 static mrb_value
 os_memsize_of(mrb_state *mrb, mrb_value self)
 {
-  mrb_int total;
+  size_t total;
   mrb_value obj;
 
   mrb_get_args(mrb, "o", &obj);
 
   total = os_memsize_of_object(mrb, obj);
-  return mrb_fixnum_value(total);
+  return mrb_fixnum_value((mrb_int)total);
 }
 
 struct os_memsize_of_all_cb_data {
-  mrb_int t;
+  size_t t;
   struct RClass *type;
 };
 
@@ -225,7 +227,7 @@ os_memsize_of_all(mrb_state *mrb, mrb_value self)
   struct os_memsize_of_all_cb_data data = { 0 };
   mrb_get_args(mrb, "|c", &data.type);
   mrb_objspace_each_objects(mrb, os_memsize_of_all_cb, &data);
-  return mrb_fixnum_value(data.t);
+  return mrb_fixnum_value((mrb_int)data.t);
 }
 
 void
diff --git a/mrbgems/mruby-pack/src/pack.c b/mrbgems/mruby-pack/src/pack.c
index 80de397f4..e222cd946 100644
--- a/mrbgems/mruby-pack/src/pack.c
+++ b/mrbgems/mruby-pack/src/pack.c
@@ -413,13 +413,13 @@ unpack_q(mrb_state *mrb, const unsigned char *src, int srclen, mrb_value ary, un
       i64tostr(msg, sizeof(msg), sll);
       mrb_raisef(mrb, E_RANGE_ERROR, "cannot unpack to Fixnum: %s", msg);
     }
-    n = sll;
+    n = (mrb_int)sll;
   } else {
     if (!POSFIXABLE(ull)) {
       u64tostr(msg, sizeof(msg), ull);
       mrb_raisef(mrb, E_RANGE_ERROR, "cannot unpack to Fixnum: %s", msg);
     }
-    n = ull;
+    n = (mrb_int)ull;
   }
   mrb_ary_push(mrb, ary, mrb_fixnum_value(n));
   return 8;
@@ -828,7 +828,7 @@ unpack_h(mrb_state *mrb, const void *src, int slen, mrb_value ary, int count, un
     }
   }
 
-  dst = mrb_str_resize(mrb, dst, dptr - dptr0);
+  dst = mrb_str_resize(mrb, dst, (mrb_int)(dptr - dptr0));
   mrb_ary_push(mrb, ary, dst);
   return (int)(sptr - sptr0);
 }
@@ -951,7 +951,7 @@ unpack_m(mrb_state *mrb, const void *src, int slen, mrb_value ary, unsigned int
   }
 
 done:
-  dst = mrb_str_resize(mrb, dst, dptr - dptr0);
+  dst = mrb_str_resize(mrb, dst, (mrb_int)(dptr - dptr0));
   mrb_ary_push(mrb, ary, dst);
   return (int)(sptr - sptr0);
 }
diff --git a/mrbgems/mruby-sleep/src/mrb_sleep.c b/mrbgems/mruby-sleep/src/mrb_sleep.c
index 1a0fba004..779786030 100644
--- a/mrbgems/mruby-sleep/src/mrb_sleep.c
+++ b/mrbgems/mruby-sleep/src/mrb_sleep.c
@@ -66,7 +66,7 @@ mrb_f_sleep(mrb_state *mrb, mrb_value self)
 #endif
     end = time(0) - beg;
 
-    return mrb_fixnum_value(end);
+    return mrb_fixnum_value((mrb_int)end);
 }
 
 /* mruby special; needed for mruby without float numbers */