summaryrefslogtreecommitdiffhomepage
path: root/src/string.c
diff options
context:
space:
mode:
authorDaniel Bovensiepen <[email protected]>2012-12-01 14:07:23 +0800
committerDaniel Bovensiepen <[email protected]>2012-12-01 14:07:23 +0800
commit40bfc86a5e0a1a70f904a080569da9662747181f (patch)
tree8f5f1d28650e8194b918293ebc7d826f0580af4f /src/string.c
parent5f00a837edd0f55ed56d4d532d06ee45d9850f3c (diff)
parent26600ca4ec2c9547927056b35b61328f12cda79a (diff)
downloadmruby-40bfc86a5e0a1a70f904a080569da9662747181f.tar.gz
mruby-40bfc86a5e0a1a70f904a080569da9662747181f.zip
Merge remote-tracking branch 'upstream/master' into mrbgems
Diffstat (limited to 'src/string.c')
-rw-r--r--src/string.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/string.c b/src/string.c
index 425b79ca7..7ab6e5806 100644
--- a/src/string.c
+++ b/src/string.c
@@ -2511,7 +2511,7 @@ mrb_cstr_to_inum(mrb_state *mrb, const char *str, int base, int badcheck)
return mrb_fixnum_value(result);
}
bad:
- mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalide string for number(%s)", str);
+ mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid string for number(%s)", str);
/* not reached */
return mrb_fixnum_value(0);
}
@@ -2621,7 +2621,7 @@ mrb_cstr_to_dbl(mrb_state *mrb, const char * p, int badcheck)
if (p == end) {
if (badcheck) {
bad:
- mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalide string for float(%s)", p);
+ mrb_raisef(mrb, E_ARGUMENT_ERROR, "invalid string for float(%s)", p);
/* not reached */
}
return d;