From 09c7eba7b1293ec187e4acd12d11887540df41a7 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 24 Aug 2008 08:39:09 +0000 Subject: * include/ruby/encoding.h (rb_str_transcode): make 3rd argument rb_econv_option_t*. * transcode.c (transcode_loop): take rb_econv_option_t* as a argument. (str_transcode0): ditto. (str_transcode): make rb_econv_option_t and call str_transcode0 with it. (rb_str_transcode): take rb_econv_option_t*. * io.c (io_fwrite): follow the rb_str_transcode change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18814 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- io.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'io.c') diff --git a/io.c b/io.c index 380c0f3116..ea1528c509 100644 --- a/io.c +++ b/io.c @@ -761,12 +761,13 @@ io_fwrite(VALUE str, rb_io_t *fptr) } if (!NIL_P(common_encoding)) { - int ecflags = 0; + rb_econv_option_t ecopts; + ecopts.flags = 0; if (fptr->mode & FMODE_INVALID_MASK) - ecflags |= (fptr->mode / (FMODE_INVALID_MASK/ECONV_INVALID_MASK)) & ECONV_INVALID_MASK; + ecopts.flags |= (fptr->mode / (FMODE_INVALID_MASK/ECONV_INVALID_MASK)) & ECONV_INVALID_MASK; if (fptr->mode & FMODE_UNDEF_MASK) - ecflags |= (fptr->mode / (FMODE_UNDEF_MASK/ECONV_UNDEF_MASK)) & ECONV_UNDEF_MASK; - str = rb_str_transcode(str, common_encoding, ecflags); + ecopts.flags |= (fptr->mode / (FMODE_UNDEF_MASK/ECONV_UNDEF_MASK)) & ECONV_UNDEF_MASK; + str = rb_str_transcode(str, common_encoding, &ecopts); } if (fptr->writeconv) { -- cgit v1.2.3