summaryrefslogtreecommitdiff
path: root/transcode.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-05 00:38:15 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-05 00:38:15 +0000
commite9cc51844637cc1b1e4fdcb5bc781b3c6d67d817 (patch)
tree7631fcc806b9a463cd22ef265281320093352303 /transcode.c
parent780678dafbe330218b70981f2e1ca06502eb28c5 (diff)
* transcode.c (encoded_dup): extract.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
-rw-r--r--transcode.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/transcode.c b/transcode.c
index e7f09a434e..d64fe80fc8 100644
--- a/transcode.c
+++ b/transcode.c
@@ -2757,6 +2757,8 @@ str_encode_bang(int argc, VALUE *argv, VALUE str)
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 @@ str_encode(int argc, VALUE *argv, VALUE str)
{
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 @@ rb_str_encode(VALUE str, VALUE to, int ecflags, VALUE ecopts)
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);