* include/ruby/encoding.h (rb_econv_option_t): defined.

  (rb_econv_open): 3rd arg changed.
  (rb_econv_open_exc): ditto.

* io.c (make_writeconv): use rb_econv_option_t.
  (make_readconv): ditto.
  (rb_econv_open): take rb_econv_option_t for options.
  (rb_econv_open_exc): ditto.
  (transcode_loop): use rb_econv_option_t.
  (econv_init): use rb_econv_option_t.



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

1 files changed, 6 insertions, 2 deletions

diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 3701b2d12f..b952c74027 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -249,14 +249,18 @@ typedef struct {
     rb_encoding *destination_encoding;
 } rb_econv_t;
 
-rb_econv_t *rb_econv_open(const char *source_encoding, const char *destination_encoding, int flags);
+typedef struct {
+    int flags;
+} rb_econv_option_t;
+
+rb_econv_t *rb_econv_open(const char *source_encoding, const char *destination_encoding, rb_econv_option_t *opts);
 rb_econv_result_t rb_econv_convert(rb_econv_t *ec,
     const unsigned char **source_buffer_ptr, const unsigned char *source_buffer_end,
     unsigned char **destination_buffer_ptr, unsigned char *destination_buffer_end,
     int flags);
 void rb_econv_close(rb_econv_t *ec);
 
-VALUE rb_econv_open_exc(const char *senc, const char *denc, int flags);
+VALUE rb_econv_open_exc(const char *senc, const char *denc, rb_econv_option_t *opts);
 
 /* result: 0:success -1:failure */
 int rb_econv_insert_output(rb_econv_t *ec,