summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-24 00:44:42 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-24 00:44:42 +0000
commit7668e5aa9d6629e0744bd734a2f252ea104b9d02 (patch)
tree25f5d218b041545e04ded687f4ae55692a65705b
parentedcaae97415aef8e34924b696570c7a28669d39d (diff)
* ext/syck/yaml2byte.c (bytestring_append, bytestring_extend):
removed wrong extra assignments. a patch from Marcus Rueckert <darix AT opensu.se> at [ruby-core:29759]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/syck/yaml2byte.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d6f9c71575..9f10d9e680 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Apr 24 09:44:40 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/syck/yaml2byte.c (bytestring_append, bytestring_extend):
+ removed wrong extra assignments. a patch from Marcus Rueckert
+ <darix AT opensu.se> at [ruby-core:29759].
+
Sat Apr 24 00:41:52 2010 Yusuke Endoh <mame@tsg.ne.jp>
* process.c (rb_f_fork): remove after_exec() which sometimes caused
diff --git a/ext/syck/yaml2byte.c b/ext/syck/yaml2byte.c
index 390deb6c0d..e5cc4e0779 100644
--- a/ext/syck/yaml2byte.c
+++ b/ext/syck/yaml2byte.c
@@ -63,7 +63,7 @@ void bytestring_append(bytestring_t *str, char code,
grow = (length - str->remaining) + CHUNKSIZE;
str->remaining += grow;
str->length += grow;
- str->buffer = S_REALLOC_N( str->buffer, char, str->length + 1 );
+ S_REALLOC_N( str->buffer, char, str->length + 1 );
assert(str->buffer);
}
curr = str->buffer + (str->length - str->remaining);
@@ -100,7 +100,7 @@ void bytestring_extend(bytestring_t *str, bytestring_t *ext)
grow = (length - str->remaining) + CHUNKSIZE;
str->remaining += grow;
str->length += grow;
- str->buffer = S_REALLOC_N( str->buffer, char, str->length + 1 );
+ S_REALLOC_N( str->buffer, char, str->length + 1 );
}
curr = str->buffer + (str->length - str->remaining);
from = ext->buffer;