зеркало из https://github.com/github/ruby.git
* transcode.c (transcode_loop): simplified.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
db6ec3105e
Коммит
1366802a1f
|
@ -1,3 +1,7 @@
|
||||||
|
Wed Aug 27 01:13:54 2008 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
|
* transcode.c (transcode_loop): simplified.
|
||||||
|
|
||||||
Wed Aug 27 01:03:23 2008 Tanaka Akira <akr@fsij.org>
|
Wed Aug 27 01:03:23 2008 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* include/ruby/encoding.h (rb_econv_result_t): enumeration constant:
|
* include/ruby/encoding.h (rb_econv_result_t): enumeration constant:
|
||||||
|
|
13
transcode.c
13
transcode.c
|
@ -1763,12 +1763,8 @@ transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
|
||||||
ret = rb_econv_convert(ec, in_pos, in_stop, out_pos, out_stop, 0);
|
ret = rb_econv_convert(ec, in_pos, in_stop, out_pos, out_stop, 0);
|
||||||
|
|
||||||
if (ret == econv_invalid_byte_sequence ||
|
if (ret == econv_invalid_byte_sequence ||
|
||||||
ret == econv_incomplete_input) {
|
ret == econv_incomplete_input ||
|
||||||
exc = make_econv_exception(ec);
|
ret == econv_undefined_conversion) {
|
||||||
rb_econv_close(ec);
|
|
||||||
rb_exc_raise(exc);
|
|
||||||
}
|
|
||||||
if (ret == econv_undefined_conversion) {
|
|
||||||
exc = make_econv_exception(ec);
|
exc = make_econv_exception(ec);
|
||||||
rb_econv_close(ec);
|
rb_econv_close(ec);
|
||||||
rb_exc_raise(exc);
|
rb_exc_raise(exc);
|
||||||
|
@ -1831,11 +1827,6 @@ transcode_loop(const unsigned char **in_pos, unsigned char **out_pos,
|
||||||
switch (ret) {
|
switch (ret) {
|
||||||
case econv_invalid_byte_sequence:
|
case econv_invalid_byte_sequence:
|
||||||
case econv_incomplete_input:
|
case econv_incomplete_input:
|
||||||
exc = make_econv_exception(ec);
|
|
||||||
rb_econv_close(ec);
|
|
||||||
rb_exc_raise(exc);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case econv_undefined_conversion:
|
case econv_undefined_conversion:
|
||||||
exc = make_econv_exception(ec);
|
exc = make_econv_exception(ec);
|
||||||
rb_econv_close(ec);
|
rb_econv_close(ec);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче