From d61fc5902a64c19918f1e0b930d6575c47568ca0 Mon Sep 17 00:00:00 2001 From: akr Date: Tue, 9 Sep 2008 15:02:42 +0000 Subject: * include/ruby/io.h (rb_io_t): rename field: writeconv_stateless to writeconv_asciicompat. * io.c: follow the renaming. * gc.c: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- io.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'io.c') diff --git a/io.c b/io.c index ef2cdab2c..bd387e3f1 100644 --- a/io.c +++ b/io.c @@ -709,7 +709,7 @@ make_writeconv(rb_io_t *fptr) fptr->writeconv = rb_econv_open_opts("", "", ecflags, ecopts); if (!fptr->writeconv) rb_exc_raise(rb_econv_open_exc("", "", ecflags)); - fptr->writeconv_stateless = Qnil; + fptr->writeconv_asciicompat = Qnil; } else { enc = fptr->encs.enc2 ? fptr->encs.enc2 : fptr->encs.enc; @@ -719,7 +719,7 @@ make_writeconv(rb_io_t *fptr) fptr->writeconv_pre_ecflags = ecflags; fptr->writeconv_pre_ecopts = ecopts; fptr->writeconv = NULL; - fptr->writeconv_stateless = Qnil; + fptr->writeconv_asciicompat = Qnil; } else { /* double conversion */ @@ -727,11 +727,11 @@ make_writeconv(rb_io_t *fptr) fptr->writeconv_pre_ecopts = ecopts; if (senc) { denc = enc->name; - fptr->writeconv_stateless = rb_str_new2(senc); + fptr->writeconv_asciicompat = rb_str_new2(senc); } else { senc = denc = ""; - fptr->writeconv_stateless = rb_str_new2(enc->name); + fptr->writeconv_asciicompat = rb_str_new2(enc->name); } ecflags = fptr->encs.ecflags & (ECONV_ERROR_HANDLER_MASK|ECONV_STATEFUL_DECORATOR_MASK); ecopts = fptr->encs.ecopts; @@ -754,8 +754,8 @@ io_fwrite(VALUE str, rb_io_t *fptr) make_writeconv(fptr); if (fptr->writeconv) { - if (!NIL_P(fptr->writeconv_stateless)) - common_encoding = fptr->writeconv_stateless; + if (!NIL_P(fptr->writeconv_asciicompat)) + common_encoding = fptr->writeconv_asciicompat; else if (!rb_enc_asciicompat(rb_enc_get(str))) { rb_raise(rb_eArgError, "ASCII incompatible string written for text mode IO without encoding conversion: %s", rb_enc_name(rb_enc_get(str))); -- cgit