1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* transcode.c (rb_econv_t): last_trans_index removed.

Browse Source 
(rb_econv_open_by_transcoder_entries): follow the type change.
  (rb_econv_open0): ditto.
  (rb_econv_decorate_at): ditto.
  (rb_econv_binmode): ditto.
  (rb_econv_insert_output): simplified because there are no decorators
  at last.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-09-09 11:37:23 +00:00
parent b96c3dfe67
commit 40c31d5b75
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Tue Sep 9 20:34:26 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (rb_econv_t): last_trans_index removed.
(rb_econv_open_by_transcoder_entries): follow the type change.
(rb_econv_open0): ditto.
(rb_econv_decorate_at): ditto.
(rb_econv_binmode): ditto.
(rb_econv_insert_output): simplified because there are no decorators
at last.
Tue Sep 9 20:21:54 2008 Tanaka Akira <akr@fsij.org> Tue Sep 9 20:21:54 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (rb_econv_open): reverse the order of decorders. * transcode.c (rb_econv_open): reverse the order of decorders.

27
transcode.c
View File

@ -109,7 +109,6 @@ struct rb_econv_t {
rb_econv_elem_t *elems; rb_econv_elem_t *elems;
int num_trans; int num_trans;
int num_finished; int num_finished;
int last_trans_index; /* last trans, not including universal newline */
struct rb_transcoding *last_tc; struct rb_transcoding *last_tc;
/* last error */ /* last error */
@ -829,7 +828,6 @@ rb_econv_open_by_transcoder_entries(int n, transcoder_entry_t **entries)
ec->elems = ALLOC_N(rb_econv_elem_t, ec->num_trans); ec->elems = ALLOC_N(rb_econv_elem_t, ec->num_trans);
ec->num_finished = 0; ec->num_finished = 0;
ec->last_tc = NULL; ec->last_tc = NULL;
ec->last_trans_index = -1;
ec->last_error.result = econv_source_buffer_empty; ec->last_error.result = econv_source_buffer_empty;
ec->last_error.error_tc = NULL; ec->last_error.error_tc = NULL;
ec->last_error.source_encoding = NULL; ec->last_error.source_encoding = NULL;
@ -850,7 +848,6 @@ rb_econv_open_by_transcoder_entries(int n, transcoder_entry_t **entries)
} }
if (ec->num_trans) if (ec->num_trans)
ec->last_tc = ec->elems[ec->num_trans-1].tc; ec->last_tc = ec->elems[ec->num_trans-1].tc;
ec->last_trans_index = ec->num_trans-1;
for (i = 0; i < ec->num_trans; i++) { for (i = 0; i < ec->num_trans; i++) {
int bufsize = 4096; int bufsize = 4096;
@ -934,11 +931,9 @@ rb_econv_open0(const char *sname, const char *dname, int ecflags)
if (num_trans == 0) { if (num_trans == 0) {
ec->last_tc = NULL; ec->last_tc = NULL;
ec->last_trans_index = -1;
} }
else { else {
ec->last_trans_index = ec->num_trans-1; ec->last_tc = ec->elems[ec->num_trans-1].tc;
ec->last_tc = ec->elems[ec->last_trans_index].tc;
} }
return ec; return ec;
@ -1507,6 +1502,7 @@ rb_econv_insert_output(rb_econv_t *ec,
const unsigned char *insert_str = NULL; const unsigned char *insert_str = NULL;
size_t insert_len; size_t insert_len;
int last_trans_index;
rb_transcoding *tc; rb_transcoding *tc;
unsigned char **buf_start_p; unsigned char **buf_start_p;
@ -1532,25 +1528,27 @@ rb_econv_insert_output(rb_econv_t *ec,
need = insert_len; need = insert_len;
tc = ec->last_tc; last_trans_index = ec->num_trans-1;
if (!tc) { if (ec->num_trans == 0) {
tc = NULL;
buf_start_p = &ec->in_buf_start; buf_start_p = &ec->in_buf_start;
data_start_p = &ec->in_data_start; data_start_p = &ec->in_data_start;
data_end_p = &ec->in_data_end; data_end_p = &ec->in_data_end;
buf_end_p = &ec->in_buf_end; buf_end_p = &ec->in_buf_end;
} }
else if (tc->transcoder->asciicompat_type == asciicompat_encoder) { else if (ec->elems[last_trans_index].tc->transcoder->asciicompat_type == asciicompat_encoder) {
tc = ec->elems[last_trans_index].tc;
need += tc->readagain_len; need += tc->readagain_len;
if (need < insert_len) if (need < insert_len)
goto fail; goto fail;
if (ec->last_trans_index == 0) { if (last_trans_index == 0) {
buf_start_p = &ec->in_buf_start; buf_start_p = &ec->in_buf_start;
data_start_p = &ec->in_data_start; data_start_p = &ec->in_data_start;
data_end_p = &ec->in_data_end; data_end_p = &ec->in_data_end;
buf_end_p = &ec->in_buf_end; buf_end_p = &ec->in_buf_end;
} }
else { else {
rb_econv_elem_t *ee = &ec->elems[ec->last_trans_index-1]; rb_econv_elem_t *ee = &ec->elems[last_trans_index-1];
buf_start_p = &ee->out_buf_start; buf_start_p = &ee->out_buf_start;
data_start_p = &ee->out_data_start; data_start_p = &ee->out_data_start;
data_end_p = &ee->out_data_end; data_end_p = &ee->out_data_end;
@ -1558,11 +1556,12 @@ rb_econv_insert_output(rb_econv_t *ec,
} }
} }
else { else {
rb_econv_elem_t *ee = &ec->elems[ec->last_trans_index]; rb_econv_elem_t *ee = &ec->elems[last_trans_index];
buf_start_p = &ee->out_buf_start; buf_start_p = &ee->out_buf_start;
data_start_p = &ee->out_data_start; data_start_p = &ee->out_data_start;
data_end_p = &ee->out_data_end; data_end_p = &ee->out_data_end;
buf_end_p = &ee->out_buf_end; buf_end_p = &ee->out_buf_end;
tc = ec->elems[last_trans_index].tc;
} }
if (*buf_start_p == NULL) { if (*buf_start_p == NULL) {
@ -1782,8 +1781,6 @@ rb_econv_decorate_at(rb_econv_t *ec, const char *decorator_name, int n)
REALLOC_N(ec->elems, rb_econv_elem_t, ec->num_trans+1); REALLOC_N(ec->elems, rb_econv_elem_t, ec->num_trans+1);
MEMMOVE(ec->elems+n+1, ec->elems+n, rb_econv_elem_t, ec->num_trans-n); MEMMOVE(ec->elems+n+1, ec->elems+n, rb_econv_elem_t, ec->num_trans-n);
ec->num_trans++; ec->num_trans++;
if (n <= ec->last_trans_index)
ec->last_trans_index++;
ec->elems[n].tc = tc; ec->elems[n].tc = tc;
@ -1865,8 +1862,6 @@ rb_econv_binmode(rb_econv_t *ec)
if (trs[k] == ec->elems[i].tc->transcoder) if (trs[k] == ec->elems[i].tc->transcoder)
break; break;
if (k == n) { if (k == n) {
if (ec->last_tc == ec->elems[i].tc)
ec->last_trans_index = j;
ec->elems[j] = ec->elems[i]; ec->elems[j] = ec->elems[i];
j++; j++;
} }