summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-08-11 20:31:34 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-08-11 20:31:34 +0900
commitfa3629b42cce8b618b061821bad26bbda1975e3d (patch)
treee594a6b324a7b5e14a83ddfcf8c96cb68192e078
parent712ad32b2a5d105b1ba894f63e274a13bb5a2ed6 (diff)
parentc4f5c2473a5e456dfe249742c7421da81615b5e1 (diff)
downloadmruby-fa3629b42cce8b618b061821bad26bbda1975e3d.tar.gz
mruby-fa3629b42cce8b618b061821bad26bbda1975e3d.zip
Merge pull request #2527 from iij/pr-remove-mrb_str_bytesize
mrb_str_bytesize is a carbon copy of mrb_str_size. remove it.
-rw-r--r--doc/language/Core.md2
-rw-r--r--src/string.c15
2 files changed, 2 insertions, 15 deletions
diff --git a/doc/language/Core.md b/doc/language/Core.md
index d7331e7f3..390581f87 100644
--- a/doc/language/Core.md
+++ b/doc/language/Core.md
@@ -938,7 +938,7 @@ n/a | src/string.c | mrb_str_bytes
ISO Code | Source File | C Function
--- | --- | ---
-n/a | src/string.c | mrb_str_bytesize
+n/a | src/string.c | mrb_str_size
#### capitalize
diff --git a/src/string.c b/src/string.c
index d7441ae85..a3a10cfc4 100644
--- a/src/string.c
+++ b/src/string.c
@@ -424,19 +424,6 @@ mrb_str_plus_m(mrb_state *mrb, mrb_value self)
return mrb_str_plus(mrb, self, str);
}
-/*
- * call-seq:
- * len = strlen(String("abcd"))
- *
- * Returns the length of string in bytes.
- */
-static mrb_value
-mrb_str_bytesize(mrb_state *mrb, mrb_value self)
-{
- struct RString *s = mrb_str_ptr(self);
- return mrb_fixnum_value(RSTR_LEN(s));
-}
-
/* 15.2.10.5.26 */
/* 15.2.10.5.33 */
/*
@@ -2488,7 +2475,7 @@ mrb_init_string(mrb_state *mrb)
s = mrb->string_class = mrb_define_class(mrb, "String", mrb->object_class); /* 15.2.10 */
MRB_SET_INSTANCE_TT(s, MRB_TT_STRING);
- mrb_define_method(mrb, s, "bytesize", mrb_str_bytesize, MRB_ARGS_NONE());
+ mrb_define_method(mrb, s, "bytesize", mrb_str_size, MRB_ARGS_NONE());
mrb_define_method(mrb, s, "<=>", mrb_str_cmp_m, MRB_ARGS_REQ(1)); /* 15.2.10.5.1 */
mrb_define_method(mrb, s, "==", mrb_str_equal_m, MRB_ARGS_REQ(1)); /* 15.2.10.5.2 */