diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-12 12:23:25 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-12 12:23:25 +0000 |
| commit | 19438eee8b6b0a51768c49e3b7b3f6070ef64c7d (patch) | |
| tree | 821e17ca49c1a2cbd86643a4f1a8b38fb54f7476 /transcode.c | |
| parent | 290ae0ea85fb958d9e0f4f0db517de7e0edb1929 (diff) | |
* transcode.c (rb_econv_t): new field: started.
(rb_econv_open_by_transcoder_entries): initialize started field.
(rb_econv_convert): set started field.
(rb_econv_insert_output): ditto.
(rb_econv_decorate_at): check started field instead of num_finished.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
| -rw-r--r-- | transcode.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/transcode.c b/transcode.c index 4e11342b17..19b5c55678 100644 --- a/transcode.c +++ b/transcode.c @@ -97,6 +97,8 @@ struct rb_econv_t { const char *source_encoding_name; const char *destination_encoding_name; + int started; + const unsigned char *replacement_str; size_t replacement_len; const char *replacement_enc; @@ -788,6 +790,7 @@ rb_econv_open_by_transcoder_entries(int n, transcoder_entry_t **entries) ec->flags = 0; ec->source_encoding_name = NULL; ec->destination_encoding_name = NULL; + ec->started = 0; ec->replacement_str = NULL; ec->replacement_len = 0; ec->replacement_enc = NULL; @@ -1331,6 +1334,8 @@ rb_econv_convert(rb_econv_t *ec, unsigned char empty_buf; unsigned char *empty_ptr = &empty_buf; + ec->started = 1; + if (!input_ptr) { input_ptr = (const unsigned char **)&empty_ptr; input_stop = empty_ptr; @@ -1478,6 +1483,8 @@ rb_econv_insert_output(rb_econv_t *ec, size_t need; + ec->started = 1; + if (len == 0) return 0; @@ -1729,7 +1736,7 @@ rb_econv_decorate_at(rb_econv_t *ec, const char *decorator_name, int n) unsigned char *p; int bufsize = 4096; - if (ec->num_finished != 0) + if (ec->started != 0) return -1; entry = get_transcoder_entry("", decorator_name); |