* dir.c (free_dir): fix memory leak. reported by yamamoto

  madoka.

* eval.c (bind_eval): new method. [RCR 251]

* string.c (rb_str_clear): new method. [ruby-dev:24104]

* io.c (rb_io_reopen): should clear allocated OpenFile.  pointed
  out by Guy Decoux. [ruby-core:03288]


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

1 files changed, 26 insertions, 0 deletions

diff --git a/string.c b/string.c
index 0b32ddeb4c..3ebf76e745 100644
--- a/string.c
+++ b/string.c
@@ -2212,6 +2212,31 @@ rb_str_replace(str, str2)
     return str;
 }
 
+/* 
+ *  call-seq:
+ *     string.clear    ->  string
+ *
+ *  Makes string empty.
+ *
+ *     a = "abcde"
+ *     a.clear    #=> ""
+ */
+
+static VALUE
+rb_str_clear(str)
+    VALUE str;
+{
+    /* rb_str_modify() */	/* no need for str_make_independent */
+    if (str_independent(str)) {
+	free(RSTRING(str)->ptr);
+    }
+    RSTRING(str)->aux.shared = 0;
+    FL_UNSET(str, ELTS_SHARED|STR_ASSOC);
+    RSTRING(str)->ptr = 0;
+    RARRAY(str)->len = 0;
+    return str;
+}
+
 static VALUE
 uscore_get()
 {
@@ -4593,6 +4618,7 @@ Init_String()
     rb_define_method(rb_cString, "index", rb_str_index_m, -1);
     rb_define_method(rb_cString, "rindex", rb_str_rindex_m, -1);
     rb_define_method(rb_cString, "replace", rb_str_replace, 1);
+    rb_define_method(rb_cString, "clear", rb_str_clear, 0);
 
     rb_define_method(rb_cString, "to_i", rb_str_to_i, -1);
     rb_define_method(rb_cString, "to_f", rb_str_to_f, 0);