Use size_t instead of int. This is for portability.

5 files changed, 22 insertions, 18 deletions

diff --git a/src/gc.c b/src/gc.c
index 6454b10c5..f8d25e5ec 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -542,7 +542,9 @@ obj_free(mrb_state *mrb, struct RBasic *obj)
 static void
 root_scan_phase(mrb_state *mrb)
 {
-  int i, j, e;
+  int j;
+  size_t i;
+  size_t e;
   mrb_callinfo *ci;
 
   if (!is_minor_gc(mrb)) {
diff --git a/src/numeric.c b/src/numeric.c
index 2abb96bec..1e089c970 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -447,7 +447,8 @@ flo_hash(mrb_state *mrb, mrb_value num)
 {
   mrb_float d;
   char *c;
-  int i, hash;
+  size_t i;
+  int hash;
 
   d = (mrb_float)mrb_fixnum(num);
   /* normalize -0.0 to 0.0 */
diff --git a/src/state.c b/src/state.c
index ba7699f8a..7b5bd1002 100644
--- a/src/state.c
+++ b/src/state.c
@@ -139,7 +139,7 @@ mrb_add_irep(mrb_state *mrb)
     mrb->irep_capa = max;
   }
   else if (mrb->irep_capa <= mrb->irep_len) {
-    int i;
+    size_t i;
     size_t old_capa = mrb->irep_capa;
     while (mrb->irep_capa <= mrb->irep_len) {
       mrb->irep_capa *= 2;
diff --git a/src/variable.c b/src/variable.c
index 95358da0c..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++) {
@@ -106,7 +106,7 @@ 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) {
@@ -130,7 +130,7 @@ 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) {
@@ -156,7 +156,8 @@ 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);
@@ -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;
@@ -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));
@@ -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) {
diff --git a/src/vm.c b/src/vm.c
index 456035c0c..aa7be1968 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -214,7 +214,7 @@ cipop(mrb_state *mrb)
 {
   if (mrb->ci->env) {
     struct REnv *e = mrb->ci->env;
-    int len = (int)e->flags;
+    size_t len = (size_t)e->flags;
     mrb_value *p = (mrb_value *)mrb_malloc(mrb, sizeof(mrb_value)*len);
 
     e->cioff = -1;
@@ -465,7 +465,7 @@ static void
 argnum_error(mrb_state *mrb, int num)
 {
   char buf[256];
-  int len;
+  size_t len;
   mrb_value exc;
 
   if (mrb->ci->mid) {