diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-21 05:36:16 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-21 05:36:16 +0000 |
| commit | fde3e70dfff553626d12aa875e579d272855b2e9 (patch) | |
| tree | 988dd41e0ba5bfe3546c9f73934322a4beb7c62b | |
| parent | ae3327d1d42aa812385c852f25b74f30e9a94fa3 (diff) | |
| download | ruby-fde3e70dfff553626d12aa875e579d272855b2e9.tar.gz ruby-fde3e70dfff553626d12aa875e579d272855b2e9.tar.xz ruby-fde3e70dfff553626d12aa875e579d272855b2e9.zip | |
* transcode.c (str_transcode): initialize transcoder in
rb_transcoding. [ruby-dev:33234]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | transcode.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -Mon Jan 21 14:32:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Jan 21 14:36:14 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * transcode.c (str_transcode): initialize transcoder in rb_transcoding. [ruby-dev:33234] diff --git a/transcode.c b/transcode.c index 370bd06c3..1b8e8ee9e 100644 --- a/transcode.c +++ b/transcode.c @@ -311,14 +311,14 @@ str_transcode(int argc, VALUE *argv, VALUE *self) return -1; } - my_transcoding.transcoder = my_transcoder; - while (!final_encoding) { /* loop for multistep transcoding */ /* later, maybe use smaller intermediate strings for very long strings */ if (!(my_transcoder = transcode_dispatch(from_e, to_e))) { rb_raise(rb_eArgError, "transcoding not supported (from %s to %s)", from_e, to_e); } + my_transcoding.transcoder = my_transcoder; + if (my_transcoder->preprocessor) { fromp = sp = (unsigned char *)RSTRING_PTR(str); slen = RSTRING_LEN(str); |