* string.c (rb_str_shared_replace): no need for

  str_make_independent.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22368 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 23 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index b422b9f48f..501a4723b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 17 12:50:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_shared_replace): no need for
+	  str_make_independent.
+
 Mon Feb 16 16:47:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/Makefile.sub (CRTDEFFLAGS): separated from DEFS.
diff --git a/string.c b/string.c
index a69972198f..ddaa6922b3 100644
--- a/string.c
+++ b/string.c
@@ -264,13 +264,14 @@ rb_str_to_str(str)
     return rb_convert_type(str, T_STRING, "String", "to_str");
 }
 
+static inline void str_discard _((VALUE str));
+
 static void
 rb_str_shared_replace(str, str2)
     VALUE str, str2;
 {
     if (str == str2) return;
-    rb_str_modify(str);
-    if (!FL_TEST(str, ELTS_SHARED)) free(RSTRING(str)->ptr);
+    str_discard(str);
     if (NIL_P(str2)) {
 	RSTRING(str)->ptr = 0;
 	RSTRING(str)->len = 0;
@@ -512,6 +513,16 @@ rb_str_modify(str)
 	str_make_independent(str);
 }
 
+static inline void
+str_discard(VALUE str)
+{
+    if (str_independent(str)) {
+	xfree(RSTRING_PTR(str));
+	RSTRING(str)->ptr = 0;
+	RSTRING(str)->len = 0;
+    }
+}
+
 void
 rb_str_associate(str, add)
     VALUE str, add;
@@ -2212,9 +2223,7 @@ str_gsub(argc, argv, str, bang)
     *bp = '\0';
     rb_str_unlocktmp(dest);
     if (bang) {
-	if (str_independent(str)) {
-	    free(RSTRING(str)->ptr);
-	}
+	str_discard(str);
 	FL_UNSET(str, STR_NOCAPA);
 	RSTRING(str)->ptr = buf;
 	RSTRING(str)->aux.capa = blen;
@@ -2312,9 +2321,7 @@ rb_str_replace(str, str2)
 
     StringValue(str2);
     if (FL_TEST(str2, ELTS_SHARED)) {
-	if (str_independent(str)) {
-	    free(RSTRING(str)->ptr);
-	}
+	str_discard(str);
 	RSTRING(str)->len = RSTRING(str2)->len;
 	RSTRING(str)->ptr = RSTRING(str2)->ptr;
 	FL_SET(str, ELTS_SHARED);
diff --git a/version.h b/version.h
index bd5aab411b..c518315863 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-02-16"
+#define RUBY_RELEASE_DATE "2009-02-17"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090216
+#define RUBY_RELEASE_CODE 20090217
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 16
+#define RUBY_RELEASE_DAY 17
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];