summaryrefslogtreecommitdiffhomepage
path: root/src/vm.c
diff options
context:
space:
mode:
authorYukihiro Matsumoto <[email protected]>2012-06-27 15:22:08 +0900
committerYukihiro Matsumoto <[email protected]>2012-06-27 15:22:08 +0900
commit3de0a625225968faa301feabaddef96b38025e2c (patch)
tree7fcc62b683f6bfdb0011d6ab45513ade5e6285ed /src/vm.c
parent0a88499f32f38b5608d50da59fc7d22132767c0d (diff)
parent50f38a7df33e8814cb7333310cfecceb6adde14d (diff)
downloadmruby-3de0a625225968faa301feabaddef96b38025e2c.tar.gz
mruby-3de0a625225968faa301feabaddef96b38025e2c.zip
resolve conflict in class.c
Diffstat (limited to 'src/vm.c')
-rw-r--r--src/vm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vm.c b/src/vm.c
index 136ece3bd..d69081c9c 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -295,7 +295,7 @@ localjump_error(mrb_state *mrb, const char *kind)
int len;
mrb_value exc;
- len = snprintf(buf, 256, "unexpected %s", kind);
+ len = snprintf(buf, sizeof(buf), "unexpected %s", kind);
exc = mrb_exc_new(mrb, E_LOCALJUMP_ERROR, buf, len);
mrb->exc = (struct RObject*)mrb_object(exc);
}
@@ -308,12 +308,12 @@ argnum_error(mrb_state *mrb, int num)
mrb_value exc;
if (mrb->ci->mid) {
- len = snprintf(buf, 256, "'%s': wrong number of arguments (%d for %d)",
+ len = snprintf(buf, sizeof(buf), "'%s': wrong number of arguments (%d for %d)",
mrb_sym2name(mrb, mrb->ci->mid),
mrb->ci->argc, num);
}
else {
- len = snprintf(buf, 256, "wrong number of arguments (%d for %d)",
+ len = snprintf(buf, sizeof(buf), "wrong number of arguments (%d for %d)",
mrb->ci->argc, num);
}
exc = mrb_exc_new(mrb, E_ARGUMENT_ERROR, buf, len);