* include/ruby/encoding.h (rb_econv_elem_t): fields removed: from and

  to.
  (rb_econv_t): new fields: source_encoding_name and
  destination_encoding_name.

* transcode.c (rb_econv_open_by_transcoder_entries): initialize the
  new fields.
  (rb_econv_open): set up the new fields.
  (econv_inspect): use the new fields.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 2 deletions

diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 2d43ca354a..16cfef2539 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -208,8 +208,6 @@ typedef enum {
 } rb_econv_result_t;
 
 typedef struct {
-    const char *from;
-    const char *to;
     struct rb_transcoding *tc;
     unsigned char *out_buf_start;
     unsigned char *out_data_start;
@@ -219,6 +217,9 @@ typedef struct {
 } rb_econv_elem_t;
 
 typedef struct {
+    const char *source_encoding_name;
+    const char *destination_encoding_name;
+
     unsigned char *in_buf_start;
     unsigned char *in_data_start;
     unsigned char *in_data_end;