ruby-changes:7640
From: akr <ko1@a...>
Date: Sat, 6 Sep 2008 04:03:36 +0900 (JST)
Subject: [ruby-changes:7640] Ruby:r19161 (trunk): * transcode.c (rb_econv_convert): use ECONV_INVALID_MASK and
akr 2008-09-06 04:03:21 +0900 (Sat, 06 Sep 2008) New Revision: 19161 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19161 Log: * transcode.c (rb_econv_convert): use ECONV_INVALID_MASK and ECONV_UNDEF_MASK. Modified files: trunk/ChangeLog trunk/transcode.c Index: ChangeLog =================================================================== --- ChangeLog (revision 19160) +++ ChangeLog (revision 19161) @@ -1,3 +1,8 @@ +Sat Sep 6 03:52:47 2008 Tanaka Akira <akr@f...> + + * transcode.c (rb_econv_convert): use ECONV_INVALID_MASK and + ECONV_UNDEF_MASK. + Sat Sep 6 06:05:09 2008 Yukihiro Matsumoto <matz@r...> * include/ruby/ruby.h (DBL2NUM): renamed from DOUBLE2NUM. Index: transcode.c =================================================================== --- transcode.c (revision 19160) +++ transcode.c (revision 19161) @@ -1289,7 +1289,8 @@ ret == econv_incomplete_input) { /* deal with invalid byte sequence */ /* todo: add more alternative behaviors */ - if (ec->flags&ECONV_INVALID_REPLACE) { + switch (ec->flags & ECONV_INVALID_MASK) { + case ECONV_INVALID_REPLACE: if (output_replacement_character(ec) == 0) goto resume; } @@ -1299,10 +1300,12 @@ /* valid character in source encoding * but no related character(s) in destination encoding */ /* todo: add more alternative behaviors */ - if (ec->flags&ECONV_UNDEF_REPLACE) { + switch (ec->flags & ECONV_UNDEF_MASK) { + case ECONV_UNDEF_REPLACE: if (output_replacement_character(ec) == 0) goto resume; - } + break; + } } return ret; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/