Fix `mrb_int` and `size_t` combination warnings.

6 files changed, 9 insertions, 10 deletions

diff --git a/src/debug.c b/src/debug.c
index 4aeed2ff7..32add68ae 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -64,7 +64,7 @@ mrb_debug_get_filename(mrb_state *mrb, mrb_irep *irep, ptrdiff_t pc)
 }
 
 MRB_API int32_t
-mrb_debug_get_line(mrb_state *mrb, mrb_irep *irep, ptrdiff_t pc)
+mrb_debug_get_line(mrb_state *mrb, const mrb_irep *irep, size_t pc)
 {
   if (irep && pc >= 0 && pc < irep->ilen) {
     mrb_irep_debug_info_file* f = NULL;
diff --git a/src/gc.c b/src/gc.c
index be812c4d3..5531207db 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -1601,11 +1601,10 @@ mrb_objspace_each_objects(mrb_state *mrb, mrb_each_object_callback *callback, vo
   }
 }
 
-mrb_int
+size_t
 mrb_objspace_page_slot_size(void)
 {
-  const mrb_int i = sizeof(RVALUE);
-  return i;
+  return sizeof(RVALUE);
 }
 
 #ifdef GC_TEST
diff --git a/src/hash.c b/src/hash.c
index fd338d53b..c891e1b22 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -523,13 +523,13 @@ ht_foreach(mrb_state *mrb, htable *t, mrb_hash_foreach_func *func, void *p)
   }
 }
 
-mrb_int
+size_t
 mrb_os_memsize_of_hash_table(mrb_value obj)
 {
   struct htable *h = mrb_hash_ptr(obj)->ht;
-  mrb_int segkv_size = 0;
+  size_t segkv_size = 0;
 
-  if(h->index) segkv_size = (sizeof(struct segkv) * h->index->capa);
+  if (h->index) segkv_size = (sizeof(struct segkv) * h->index->capa);
 
   return sizeof(htable) +
     sizeof(segindex) +
diff --git a/src/load.c b/src/load.c
index 307785982..247d511df 100644
--- a/src/load.c
+++ b/src/load.c
@@ -54,7 +54,7 @@ str_to_double(mrb_state *mrb, const char *p, size_t len)
 }
 #endif
 
-mrb_value mrb_str_len_to_inum(mrb_state *mrb, const char *str, mrb_int len, mrb_int base, int badcheck);
+mrb_value mrb_str_len_to_inum(mrb_state *mrb, const char *str, size_t len, mrb_int base, int badcheck);
 
 static void
 tempirep_free(mrb_state *mrb, void *p)
diff --git a/src/string.c b/src/string.c
index 78c41c5f3..f2c52404e 100644
--- a/src/string.c
+++ b/src/string.c
@@ -2258,7 +2258,7 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str)
 }
 
 mrb_value
-mrb_str_len_to_inum(mrb_state *mrb, const char *str, mrb_int len, mrb_int base, int badcheck)
+mrb_str_len_to_inum(mrb_state *mrb, const char *str, size_t len, mrb_int base, int badcheck)
 {
   const char *p = str;
   const char *pend = str + len;
diff --git a/src/variable.c b/src/variable.c
index f05fcee90..c36fea6e3 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -1128,7 +1128,7 @@ mrb_class_find_path(mrb_state *mrb, struct RClass *c)
   return path;
 }
 
-mrb_int
+size_t
 mrb_obj_iv_tbl_memsize(mrb_state* mrb, mrb_value obj)
 {
   size_t nseg = 0;