nobu	2011-02-05 09:38:15 +0900 (Sat, 05 Feb 2011)

  New Revision: 30788

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30788

  Log:
    * transcode.c (encoded_dup): extract.

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30787)
+++ ChangeLog	(revision 30788)
@@ -1,3 +1,7 @@
+Sat Feb  5 09:38:08 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* transcode.c (encoded_dup): extract.
+
 Sat Feb  5 03:37:47 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/fileutils.rb (FileUtils::LowMethods): make low level methods
Index: transcode.c
===================================================================
--- transcode.c	(revision 30787)
+++ transcode.c	(revision 30788)
@@ -2757,6 +2757,8 @@
     return str_encode_associate(str, encidx);
 }
 
+static VALUE encoded_dup(VALUE newstr, VALUE str, int encidx);
+
 /*
  *  call-seq:
  *     str.encode(encoding [, options] )   -> str
@@ -2816,15 +2818,7 @@
 {
     VALUE newstr = str;
     int encidx = str_transcode(argc, argv, &newstr);
-
-    if (encidx < 0) return rb_str_dup(str);
-    if (newstr == str) {
-	newstr = rb_str_dup(str);
-    }
-    else {
-	RBASIC(newstr)->klass = rb_obj_class(str);
-    }
-    return str_encode_associate(newstr, encidx);
+    return encoded_dup(newstr, str, encidx);
 }
 
 VALUE
@@ -2834,7 +2828,12 @@
     VALUE *argv = &to;
     VALUE newstr = str;
     int encidx = str_transcode0(argc, argv, &newstr, ecflags, ecopts);
+    return encoded_dup(newstr, str, encidx);
+}
 
+static VALUE
+encoded_dup(VALUE newstr, VALUE str, int encidx)
+{
     if (encidx < 0) return rb_str_dup(str);
     if (newstr == str) {
 	newstr = rb_str_dup(str);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/