diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-14 11:31:27 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-14 11:31:27 +0000 |
commit | bd9bd5295453b4287a4c6190a2b656d2e2a6eec0 (patch) | |
tree | 6f901601a9b62ab5d86bbc6468d76605ef417e41 /transcode_data.h | |
parent | dd927511043de7343fbbcac7e8daba95ebf3a2d2 (diff) |
* transcode_data.h (transcode_invalid_byte_sequence): renamed from
transcode_invalid_input.
(transcode_destination_buffer_full): renamed from transcode_obuf_full.
(transcode_source_buffer_empty): renamed from transcode_ibuf_empty.
(rb_econv_result_t): renamed from rb_trans_result_t.
(rb_econv_elem_t): renamed from rb_trans_elem_t.
(rb_econv_t): renamed from rb_trans_t.
* transcode.c (UNIVERSAL_NEWLINE_DECODER): renamed from
UNIVERSAL_NEWLINE.
(CRLF_NEWLINE_ENCODER): renamed from CRLF_NEWLINE.
(CR_NEWLINE_ENCODER): renamed from CR_NEWLINE.
(rb_econv_open): renamed from rb_trans_open.
(rb_econv_close): renamed from rb_trans_close.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode_data.h')
-rw-r--r-- | transcode_data.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/transcode_data.h b/transcode_data.h index f843e6b205..e949471928 100644 --- a/transcode_data.h +++ b/transcode_data.h @@ -112,13 +112,13 @@ struct rb_transcoder { }; typedef enum { - transcode_invalid_input, + transcode_invalid_byte_sequence, transcode_undefined_conversion, - transcode_obuf_full, - transcode_ibuf_empty, + transcode_destination_buffer_full, + transcode_source_buffer_empty, transcode_finished, transcode_output_followed_by_input, -} rb_trans_result_t; +} rb_econv_result_t; typedef struct { const char *from; @@ -128,15 +128,15 @@ typedef struct { unsigned char *out_data_start; unsigned char *out_data_end; unsigned char *out_buf_end; - rb_trans_result_t last_result; -} rb_trans_elem_t; + rb_econv_result_t last_result; +} rb_econv_elem_t; typedef struct { - rb_trans_elem_t *elems; + rb_econv_elem_t *elems; int num_trans; int num_finished; rb_transcoding *last_tc; -} rb_trans_t; +} rb_econv_t; void rb_declare_transcoder(const char *enc1, const char *enc2, const char *lib); void rb_register_transcoder(const rb_transcoder *); |