summaryrefslogtreecommitdiffhomepage
path: root/src/array.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-06-17 08:26:02 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2017-06-17 08:39:43 +0900
commitaa8121cf3a25de845d9b90a518f840eddf265afe (patch)
treea260e3b5e389e26cb618e7c043c2c0c5efdbbdde /src/array.c
parent0411cea2dfaea223becfdb8da44e29e81325c331 (diff)
downloadmruby-aa8121cf3a25de845d9b90a518f840eddf265afe.tar.gz
mruby-aa8121cf3a25de845d9b90a518f840eddf265afe.zip
Use `mrb_int` instead of `size_t` for array capacity and length.
Diffstat (limited to 'src/array.c')
-rw-r--r--src/array.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/array.c b/src/array.c
index 1f1127382..86fb50e5c 100644
--- a/src/array.c
+++ b/src/array.c
@@ -122,7 +122,7 @@ ary_modify(mrb_state *mrb, struct RArray *a)
}
else {
mrb_value *ptr, *p;
- size_t len;
+ mrb_int len;
p = a->ptr;
len = a->len * sizeof(mrb_value);
@@ -165,9 +165,9 @@ ary_make_shared(mrb_state *mrb, struct RArray *a)
}
static void
-ary_expand_capa(mrb_state *mrb, struct RArray *a, size_t len)
+ary_expand_capa(mrb_state *mrb, struct RArray *a, mrb_int len)
{
- size_t capa = a->aux.capa;
+ mrb_int capa = a->aux.capa;
if (len > ARY_MAX_SIZE) {
size_error:
@@ -189,10 +189,10 @@ ary_expand_capa(mrb_state *mrb, struct RArray *a, size_t len)
goto size_error;
}
- if (capa > (size_t)a->aux.capa) {
+ if (capa > a->aux.capa) {
mrb_value *expanded_ptr = (mrb_value *)mrb_realloc(mrb, a->ptr, sizeof(mrb_value)*capa);
- a->aux.capa = (mrb_int)capa;
+ a->aux.capa = capa;
a->ptr = expanded_ptr;
}
}
@@ -596,7 +596,7 @@ mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_val
struct RArray *a = mrb_ary_ptr(ary);
const mrb_value *argv;
mrb_int argc;
- size_t tail;
+ mrb_int tail;
ary_modify(mrb, a);
@@ -611,7 +611,7 @@ mrb_ary_splice(mrb_state *mrb, mrb_value ary, mrb_int head, mrb_int len, mrb_val
}
}
tail = head + len;
- if (a->len < len || (size_t)a->len < tail) {
+ if (a->len < len || a->len < tail) {
len = a->len - head;
}