summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-04-11 23:45:15 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-04-11 23:45:15 +0900
commit92156b46194591ea7608ee9c587c6e29cacd25ea (patch)
treee5608925a6c061a27349d13bf363b700bfeb4f97
parentf53b2601a0b2de6286106be237babcb510e07421 (diff)
parent824d3450c5c477342519f6df2df7bff08918ebef (diff)
downloadmruby-92156b46194591ea7608ee9c587c6e29cacd25ea.tar.gz
mruby-92156b46194591ea7608ee9c587c6e29cacd25ea.zip
Merge pull request #2044 from take-cheeze/const_argv
Qualify argv argument of API `const`.
-rw-r--r--include/mruby.h8
-rw-r--r--include/mruby/error.h2
-rw-r--r--mrbgems/mruby-fiber/src/fiber.c2
-rw-r--r--src/class.c2
-rw-r--r--src/error.c4
-rw-r--r--src/vm.c4
6 files changed, 11 insertions, 11 deletions
diff --git a/include/mruby.h b/include/mruby.h
index edf478f18..0ab2d8037 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -184,7 +184,7 @@ void mrb_define_module_function(mrb_state*, struct RClass*, const char*, mrb_fun
void mrb_define_const(mrb_state*, struct RClass*, const char *name, mrb_value);
void mrb_undef_method(mrb_state*, struct RClass*, const char*);
void mrb_undef_class_method(mrb_state*, struct RClass*, const char*);
-mrb_value mrb_obj_new(mrb_state *mrb, struct RClass *c, int argc, mrb_value *argv);
+mrb_value mrb_obj_new(mrb_state *mrb, struct RClass *c, int argc, const mrb_value *argv);
#define mrb_class_new_instance(mrb,argc,argv,c) mrb_obj_new(mrb,c,argc,argv)
mrb_value mrb_instance_new(mrb_state *mrb, mrb_value cv);
struct RClass * mrb_class_new(mrb_state *mrb, struct RClass *super);
@@ -243,8 +243,8 @@ int mrb_get_args(mrb_state *mrb, const char *format, ...);
#define mrb_strlen_lit(lit) (sizeof(lit "") - 1)
mrb_value mrb_funcall(mrb_state*, mrb_value, const char*, int,...);
-mrb_value mrb_funcall_argv(mrb_state*, mrb_value, mrb_sym, int, mrb_value*);
-mrb_value mrb_funcall_with_block(mrb_state*, mrb_value, mrb_sym, int, mrb_value*, mrb_value);
+mrb_value mrb_funcall_argv(mrb_state*, mrb_value, mrb_sym, int, const mrb_value*);
+mrb_value mrb_funcall_with_block(mrb_state*, mrb_value, mrb_sym, int, const mrb_value*, mrb_value);
mrb_sym mrb_intern_cstr(mrb_state*,const char*);
mrb_sym mrb_intern(mrb_state*,const char*,size_t);
mrb_sym mrb_intern_static(mrb_state*,const char*,size_t);
@@ -390,7 +390,7 @@ mrb_bool mrb_respond_to(mrb_state *mrb, mrb_value obj, mrb_sym mid);
mrb_bool mrb_obj_is_instance_of(mrb_state *mrb, mrb_value obj, struct RClass* c);
/* fiber functions (you need to link mruby-fiber mrbgem to use) */
-mrb_value mrb_fiber_yield(mrb_state *mrb, int argc, mrb_value *argv);
+mrb_value mrb_fiber_yield(mrb_state *mrb, int argc, const mrb_value *argv);
#define E_FIBER_ERROR (mrb_class_get(mrb, "FiberError"))
/* memory pool implementation */
diff --git a/include/mruby/error.h b/include/mruby/error.h
index e357606e4..689cf4b8f 100644
--- a/include/mruby/error.h
+++ b/include/mruby/error.h
@@ -14,7 +14,7 @@ extern "C" {
void mrb_sys_fail(mrb_state *mrb, const char *mesg);
mrb_value mrb_exc_new_str(mrb_state *mrb, struct RClass* c, mrb_value str);
#define mrb_exc_new_str_lit(mrb, c, lit) mrb_exc_new_str(mrb, c, mrb_str_new_lit(mrb, lit))
-mrb_value mrb_make_exception(mrb_state *mrb, int argc, mrb_value *argv);
+mrb_value mrb_make_exception(mrb_state *mrb, int argc, const mrb_value *argv);
mrb_value mrb_format(mrb_state *mrb, const char *format, ...);
void mrb_exc_print(mrb_state *mrb, struct RObject *exc);
void mrb_print_backtrace(mrb_state *mrb);
diff --git a/mrbgems/mruby-fiber/src/fiber.c b/mrbgems/mruby-fiber/src/fiber.c
index 86f6e81cc..cf0661fae 100644
--- a/mrbgems/mruby-fiber/src/fiber.c
+++ b/mrbgems/mruby-fiber/src/fiber.c
@@ -259,7 +259,7 @@ fiber_transfer(mrb_state *mrb, mrb_value self)
}
mrb_value
-mrb_fiber_yield(mrb_state *mrb, int len, mrb_value *a)
+mrb_fiber_yield(mrb_state *mrb, int len, const mrb_value *a)
{
struct mrb_context *c = mrb->c;
mrb_callinfo *ci;
diff --git a/src/class.c b/src/class.c
index 656120845..30c33d692 100644
--- a/src/class.c
+++ b/src/class.c
@@ -1092,7 +1092,7 @@ mrb_instance_new(mrb_state *mrb, mrb_value cv)
}
mrb_value
-mrb_obj_new(mrb_state *mrb, struct RClass *c, int argc, mrb_value *argv)
+mrb_obj_new(mrb_state *mrb, struct RClass *c, int argc, const mrb_value *argv)
{
mrb_value obj;
diff --git a/src/error.c b/src/error.c
index be47e1618..c344509b9 100644
--- a/src/error.c
+++ b/src/error.c
@@ -353,7 +353,7 @@ set_backtrace(mrb_state *mrb, mrb_value info, mrb_value bt)
}
static mrb_value
-make_exception(mrb_state *mrb, int argc, mrb_value *argv, mrb_bool isstr)
+make_exception(mrb_state *mrb, int argc, const mrb_value *argv, mrb_bool isstr)
{
mrb_value mesg;
int n;
@@ -406,7 +406,7 @@ exception_call:
}
mrb_value
-mrb_make_exception(mrb_state *mrb, int argc, mrb_value *argv)
+mrb_make_exception(mrb_state *mrb, int argc, const mrb_value *argv)
{
return make_exception(mrb, argc, argv, TRUE);
}
diff --git a/src/vm.c b/src/vm.c
index d499fa1a4..5b9a7bf65 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -323,7 +323,7 @@ mrb_funcall(mrb_state *mrb, mrb_value self, const char *name, int argc, ...)
}
mrb_value
-mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, 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;
@@ -413,7 +413,7 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, mr
}
mrb_value
-mrb_funcall_argv(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, 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());
}