From 570befe608c7e8b0fde9374bffdafcf7a7e088c8 Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 10 Jul 2003 02:30:08 +0000 Subject: [PATCH] * lib/rexml/encodings/EUC-JP.rb (Encoding): use join. * lib/rexml/encodings/Shift-JIS.rb (Encoding): use join, and typo fixed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rexml/encodings/EUC-JP.rb | 4 ++-- lib/rexml/encodings/Shift-JIS.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/rexml/encodings/EUC-JP.rb b/lib/rexml/encodings/EUC-JP.rb index 23a1c3c657..1be5663be8 100644 --- a/lib/rexml/encodings/EUC-JP.rb +++ b/lib/rexml/encodings/EUC-JP.rb @@ -18,11 +18,11 @@ rescue LoadError module REXML module Encoding def from_euc_jp(str) - return Iconv::iconv("utf-8", "euc-jp", str)[0] + return Iconv::iconv("utf-8", "euc-jp", str).join end def to_euc_jp content - return Iconv::iconv("euc-jp", "utf-8", content)[0] + return Iconv::iconv("euc-jp", "utf-8", content).join end end end diff --git a/lib/rexml/encodings/Shift-JIS.rb b/lib/rexml/encodings/Shift-JIS.rb index e805456ea7..d5267c01b2 100644 --- a/lib/rexml/encodings/Shift-JIS.rb +++ b/lib/rexml/encodings/Shift-JIS.rb @@ -18,11 +18,11 @@ rescue LoadError module REXML module Encoding def from_shift_jis(str) - return Iconv::iconv("utf-8", "shift-jis", str)[0] + return Iconv::iconv("utf-8", "shift-jis", str).join end def to_shift_jis content - return Iconv::iconv("euc-jp", "shift-jis", content)[0] + return Iconv::iconv("shift-jis", "utf-8", content).join end end end