diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-26 11:16:07 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-26 11:16:07 +0000 |
| commit | d2165fe2bb2756c2f781c3255005476c90b02020 (patch) | |
| tree | 8dfbbdd0c4e4ea70324636db65a1234957c76946 /include | |
| parent | cef98ef8e3bc2bc466283ebf94e45e6b5dd53d46 (diff) | |
merges r21059 from trunk into ruby_1_9_1.
* io.c (fptr_finalize): close the IO object even if finish_writeconv or
flush is failed.
(finish_writeconv): don't raise. return errno or exception.
(finish_writeconv_arg): removed.
(finish_writeconv_sync): follow finish_writeconv change.
* transcode.c (rb_econv_make_exception): new function.
* include/ruby/encoding.h (rb_econv_make_exception): declared.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/encoding.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 64bfff5944..6a808a58cb 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -248,6 +248,9 @@ const char *rb_econv_encoding_to_insert_output(rb_econv_t *ec); /* raise an error if the last rb_econv_convert is error */ void rb_econv_check_error(rb_econv_t *ec); +/* returns an exception object or nil */ +VALUE rb_econv_make_exception(rb_econv_t *ec); + int rb_econv_putbackable(rb_econv_t *ec); void rb_econv_putback(rb_econv_t *ec, unsigned char *p, int n); |