1 files changed, 30 insertions, 29 deletions

diff --git a/src/variable.c b/src/variable.c
index d470b0327..c191b2be2 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -28,8 +28,8 @@ typedef struct segment {
 
 typedef struct iv_tbl {
   segment *rootseg;
-  int size;
-  int last_len;
+  size_t size;
+  size_t last_len;
 } iv_tbl;
 
 static iv_tbl*
@@ -52,8 +52,8 @@ iv_put(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value val)
   segment *seg = t->rootseg;
   segment *prev = NULL;
   segment *matched_seg = NULL;
-  int matched_idx = 0;
-  int i;
+  size_t matched_idx = 0;
+  size_t i;
 
   while (seg) {
     for (i=0; i<MRB_SEGMENT_SIZE; i++) {
@@ -102,11 +102,11 @@ iv_put(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value val)
   return;
 }
 
-static int
+static mrb_bool
 iv_get(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
 {
   segment *seg;
-  int i;
+  size_t i;
 
   seg = t->rootseg;
   while (seg) {
@@ -126,11 +126,11 @@ iv_get(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
   return FALSE;
 }
 
-static int
+static mrb_bool
 iv_del(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
 {
   segment *seg;
-  int i;
+  size_t i;
 
   seg = t->rootseg;
   while (seg) {
@@ -152,11 +152,12 @@ iv_del(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
   return FALSE;
 }
 
-static int
+static mrb_bool
 iv_foreach(mrb_state *mrb, iv_tbl *t, iv_foreach_func *func, void *p)
 {
   segment *seg;
-  int i, n;
+  size_t i;
+  int n;
 
   seg = t->rootseg;
   while (seg) {
@@ -181,11 +182,11 @@ iv_foreach(mrb_state *mrb, iv_tbl *t, iv_foreach_func *func, void *p)
   return TRUE;
 }
 
-static int
+static size_t
 iv_size(mrb_state *mrb, iv_tbl *t)
 {
   segment *seg;
-  int size = 0;
+  size_t size = 0;
 
   if (!t) return 0;
   if (t->size > 0) return t->size;
@@ -208,7 +209,7 @@ iv_copy(mrb_state *mrb, iv_tbl *t)
   segment *seg;
   iv_tbl *t2;
 
-  int i;
+  size_t i;
 
   seg = t->rootseg;
   t2 = iv_new(mrb);
@@ -273,7 +274,7 @@ iv_put(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value val)
   kh_value(h, k) = val;
 }
 
-static int
+static mrb_bool
 iv_get(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
 {
   khash_t(iv) *h = &t->h;
@@ -287,7 +288,7 @@ iv_get(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
   return FALSE;
 }
 
-static int
+static mrb_bool
 iv_del(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
 {
   khash_t(iv) *h = &t->h;
@@ -305,7 +306,7 @@ iv_del(mrb_state *mrb, iv_tbl *t, mrb_sym sym, mrb_value *vp)
   return FALSE;
 }
 
-static int
+static mrb_bool
 iv_foreach(mrb_state *mrb, iv_tbl *t, iv_foreach_func *func, void *p)
 {
   khash_t(iv) *h = &t->h;
@@ -326,7 +327,7 @@ iv_foreach(mrb_state *mrb, iv_tbl *t, iv_foreach_func *func, void *p)
   return TRUE;
 }
 
-static int
+static size_t
 iv_size(mrb_state *mrb, iv_tbl *t)
 {
   khash_t(iv) *h = &t->h;
@@ -408,7 +409,7 @@ mrb_vm_special_set(mrb_state *mrb, mrb_sym i, mrb_value v)
 {
 }
 
-static int
+static mrb_bool
 obj_iv_p(mrb_value obj)
 {
   switch (mrb_type(obj)) {
@@ -481,7 +482,7 @@ mrb_iv_set(mrb_state *mrb, mrb_value obj, mrb_sym sym, mrb_value v)
   }
 }
 
-int
+mrb_bool
 mrb_obj_iv_defined(mrb_state *mrb, struct RObject *obj, mrb_sym sym)
 {
   iv_tbl *t;
@@ -493,7 +494,7 @@ mrb_obj_iv_defined(mrb_state *mrb, struct RObject *obj, mrb_sym sym)
   return FALSE;
 }
 
-int
+mrb_bool
 mrb_iv_defined(mrb_state *mrb, mrb_value obj, mrb_sym sym)
 {
   if (!obj_iv_p(obj)) return FALSE;
@@ -541,7 +542,7 @@ mrb_value
 mrb_obj_iv_inspect(mrb_state *mrb, struct RObject *obj)
 {
   iv_tbl *t = obj->iv;
-  int len = iv_size(mrb, t);
+  size_t len = iv_size(mrb, t);
 
   if (len > 0) {
     const char *cn = mrb_obj_classname(mrb, mrb_obj_value(obj));
@@ -733,7 +734,7 @@ mrb_cv_set(mrb_state *mrb, mrb_value mod, mrb_sym sym, mrb_value v)
   mrb_mod_cv_set(mrb, mrb_class_ptr(mod), sym, v);
 }
 
-int
+mrb_bool
 mrb_mod_cv_defined(mrb_state *mrb, struct RClass * c, mrb_sym sym)
 {
   while (c) {
@@ -747,7 +748,7 @@ mrb_mod_cv_defined(mrb_state *mrb, struct RClass * c, mrb_sym sym)
   return FALSE;
 }
 
-int
+mrb_bool
 mrb_cv_defined(mrb_state *mrb, mrb_value mod, mrb_sym sym)
 {
   return mrb_mod_cv_defined(mrb, mrb_class_ptr(mod), sym);
@@ -789,7 +790,7 @@ mrb_vm_cv_set(mrb_state *mrb, mrb_sym sym, mrb_value v)
   iv_put(mrb, c->iv, sym, v);
 }
 
-int
+mrb_bool
 mrb_const_defined(mrb_state *mrb, mrb_value mod, mrb_sym sym)
 {
   struct RClass *m = mrb_class_ptr(mod);
@@ -819,7 +820,7 @@ const_get(mrb_state *mrb, struct RClass *base, mrb_sym sym)
   struct RClass *c = base;
   mrb_value v;
   iv_tbl *t;
-  int retry = 0;
+  mrb_bool retry = 0;
   mrb_sym cm;
 
 L_RETRY:
@@ -970,7 +971,7 @@ mrb_f_global_variables(mrb_state *mrb, mrb_value self)
 {
   iv_tbl *t = mrb->globals;
   mrb_value ary = mrb_ary_new(mrb);
-  int i;
+  size_t i;
   char buf[3];
 
   if (t) {
@@ -985,11 +986,11 @@ mrb_f_global_variables(mrb_state *mrb, mrb_value self)
   return ary;
 }
 
-static int
-mrb_const_defined_0(mrb_state *mrb, struct RClass *klass, mrb_sym id, int exclude, int recurse)
+static mrb_bool
+mrb_const_defined_0(mrb_state *mrb, struct RClass *klass, mrb_sym id, mrb_bool exclude, mrb_bool recurse)
 {
   struct RClass * tmp;
-  int mod_retry = 0;
+  mrb_bool mod_retry = 0;
 
   tmp = klass;
 retry: