From 615b20dee898e404ef551d1965fd216e98d73177 Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 5 Sep 2008 19:03:21 +0000 Subject: * transcode.c (rb_econv_convert): use ECONV_INVALID_MASK and ECONV_UNDEF_MASK. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ transcode.c | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0625fdcee..c9955d243 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Sep 6 03:52:47 2008 Tanaka Akira + + * transcode.c (rb_econv_convert): use ECONV_INVALID_MASK and + ECONV_UNDEF_MASK. + Sat Sep 6 06:05:09 2008 Yukihiro Matsumoto * include/ruby/ruby.h (DBL2NUM): renamed from DOUBLE2NUM. diff --git a/transcode.c b/transcode.c index 09c732366..766425125 100644 --- a/transcode.c +++ b/transcode.c @@ -1289,7 +1289,8 @@ rb_econv_convert(rb_econv_t *ec, 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 @@ rb_econv_convert(rb_econv_t *ec, /* 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; -- cgit