From dd1ce5d53efa9a00cd9bdc7a7771bc6489da4469 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 29 Aug 2020 07:38:45 +0900 Subject: Silence warnings from implicit integer conversions. Caused from combination of `mrb_int`, `int` and `size_t`.. --- src/class.c | 4 ++-- src/vm.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/class.c b/src/class.c index ac5652e9a..668f9a6ce 100644 --- a/src/class.c +++ b/src/class.c @@ -50,7 +50,7 @@ mt_new(mrb_state *mrb) return t; } -static struct mt_elem *mt_put(mrb_state *mrb, mt_tbl *t, mrb_sym sym, int func_p, union mt_ptr ptr); +static struct mt_elem *mt_put(mrb_state *mrb, mt_tbl *t, mrb_sym sym, size_t func_p, union mt_ptr ptr); static void mt_rehash(mrb_state *mrb, mt_tbl *t) @@ -81,7 +81,7 @@ mt_rehash(mrb_state *mrb, mt_tbl *t) /* Set the value for the symbol in the method table. */ static struct mt_elem* -mt_put(mrb_state *mrb, mt_tbl *t, mrb_sym sym, int func_p, union mt_ptr ptr) +mt_put(mrb_state *mrb, mt_tbl *t, mrb_sym sym, size_t func_p, union mt_ptr ptr) { size_t hash, pos, start; struct mt_elem *dslot = NULL; diff --git a/src/vm.c b/src/vm.c index 7c14b40dd..5f781e8bb 100644 --- a/src/vm.c +++ b/src/vm.c @@ -333,7 +333,7 @@ static mrb_value mrb_run(mrb_state *mrb, const struct RProc* proc, mrb_value sel #endif MRB_API mrb_value -mrb_funcall(mrb_state *mrb, mrb_value self, const char *name, mrb_int argc, ...) +mrb_funcall(mrb_state *mrb, mrb_value self, const char *name, int argc, ...) { mrb_value argv[MRB_FUNCALL_ARGC_MAX]; va_list ap; @@ -353,7 +353,7 @@ mrb_funcall(mrb_state *mrb, mrb_value self, const char *name, mrb_int argc, ...) } MRB_API mrb_value -mrb_funcall_id(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc, ...) +mrb_funcall_id(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, ...) { mrb_value argv[MRB_FUNCALL_ARGC_MAX]; va_list ap; @@ -396,7 +396,7 @@ ci_nregs(mrb_callinfo *ci) } MRB_API mrb_value -mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc, const mrb_value *argv, mrb_value blk) +mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, const mrb_value *argv, mrb_value blk) { mrb_value val; int ai = mrb_gc_arena_save(mrb); @@ -497,7 +497,7 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc } MRB_API mrb_value -mrb_funcall_argv(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc, const mrb_value *argv) +mrb_funcall_argv(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, const mrb_value *argv) { return mrb_funcall_with_block(mrb, self, mid, argc, argv, mrb_nil_value()); } @@ -849,7 +849,7 @@ argnum_error(mrb_state *mrb, mrb_int num) { mrb_value exc; mrb_value str; - mrb_int argc = mrb->c->ci->argc; + int argc = mrb->c->ci->argc; if (argc < 0) { mrb_value args = mrb->c->stack[1]; @@ -1303,7 +1303,7 @@ RETRY_TRY_BLOCK: struct RBreak *brk = (struct RBreak*)mrb->exc; mrb_value target = mrb_break_value_get(brk); mrb_assert(mrb_integer_p(target)); - a = mrb_integer(target); + a = (uint32_t)mrb_integer(target); mrb_assert(a >= 0 && a < irep->ilen); } CHECKPOINT_MAIN(RBREAK_TAG_JUMP) { -- cgit v1.2.3