summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-04 10:06:26 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-04 10:06:26 +0000
commit02df423f79227a017369b2edf698aaf5f8454301 (patch)
tree53ebfd80f09c8fe8c8cde805ba72a13578271148
parent536e1170332525134e6597764b75e6b46f475516 (diff)
downloadruby-02df423f79227a017369b2edf698aaf5f8454301.tar.gz
ruby-02df423f79227a017369b2edf698aaf5f8454301.tar.xz
ruby-02df423f79227a017369b2edf698aaf5f8454301.zip
* ext/nkf/nkf.c (rb_nkf_enc_get): don't replicate encoding.
[ruby-dev:36575] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19675 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/nkf/nkf.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d828abce..cb78943c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 4 19:02:59 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf.c (rb_nkf_enc_get): don't replicate encoding.
+ [ruby-dev:36575]
+
Sat Oct 4 18:47:22 2008 NARUSE, Yui <naruse@ruby-lang.org>
* ext/stringio/stringio.c (strio_external_encoding): defined.
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index 24761449d..a0c14b55a 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -69,9 +69,6 @@ rb_encoding* rb_nkf_enc_get(const char *name)
idx = rb_enc_find_index(nkf_enc_name(nkf_enc_to_base_encoding(nkf_enc)));
if (idx < 0) {
idx = rb_define_dummy_encoding(name);
- } else {
- rb_encoding *rb_enc = rb_enc_from_index(idx);
- idx = rb_enc_replicate(name, rb_enc);
}
}
return rb_enc_from_index(idx);