summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-29 16:35:47 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-29 16:35:47 +0000
commit8d9183c8982322a5ffd583ec873bb1b946ab7d6e (patch)
tree600fae58acadd69d0838820ad25d265fceb5d857
parent5cfd7e5d4faf0f0b6060ed89fbcd6532c70e0517 (diff)
downloadruby-8d9183c8982322a5ffd583ec873bb1b946ab7d6e.tar.gz
ruby-8d9183c8982322a5ffd583ec873bb1b946ab7d6e.tar.xz
ruby-8d9183c8982322a5ffd583ec873bb1b946ab7d6e.zip
* array.c (rb_ary_splice): remove redundant check.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--array.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b4ccc5d51..bd581e101 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 30 01:32:15 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * array.c (rb_ary_splice): remove redundant check.
+
Thu Oct 30 01:24:55 2008 Yusuke Endoh <mame@tsg.ne.jp>
* string.c (rb_str_cmp): fix condition which always returned true
diff --git a/array.c b/array.c
index cbf07f2ad..5aefe9f8c 100644
--- a/array.c
+++ b/array.c
@@ -1198,10 +1198,6 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
else {
long alen;
- if (beg + len > RARRAY_LEN(ary)) {
- len = RARRAY_LEN(ary) - beg;
- }
-
alen = RARRAY_LEN(ary) + rlen - len;
if (alen >= ARY_CAPA(ary)) {
ary_resize_capa(ary, alen);