Mercurial > hg > xemacs-beta
diff src/file-coding.c @ 5126:2a462149bd6a ben-lisp-object
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 24 Feb 2010 19:04:27 -0600 |
| parents | b5df3737028a 9410323e4b0d |
| children | a9c41067dd88 |
line wrap: on
line diff
--- a/src/file-coding.c Wed Feb 24 01:58:04 2010 -0600 +++ b/src/file-coding.c Wed Feb 24 19:04:27 2010 -0600 @@ -1860,7 +1860,7 @@ Dynarr_atp (str->convert_from, rejected), readmore); /* Trim size down to how much we actually got */ - Dynarr_set_length (str->convert_from, rejected + max (0, read_size)); + Dynarr_set_lengthr (str->convert_from, rejected + max (0, read_size)); } if (read_size < 0) /* LSTREAM_ERROR */ @@ -1894,7 +1894,7 @@ memmove (Dynarr_begin (str->convert_from), Dynarr_atp (str->convert_from, processed), to_process - processed); - Dynarr_set_length (str->convert_from, to_process - processed); + Dynarr_set_lengthr (str->convert_from, to_process - processed); } } @@ -4419,7 +4419,7 @@ data->stream.avail_out = reserved; zerr = inflate (&data->stream, Z_NO_FLUSH); /* Lop off the unused portion */ - Dynarr_set_length (dst, Dynarr_length (dst) - data->stream.avail_out); + Dynarr_set_lengthr (dst, Dynarr_length (dst) - data->stream.avail_out); if (zerr != Z_OK) break; } @@ -4479,7 +4479,7 @@ deflate (&data->stream, str->eof ? Z_FINISH : Z_NO_FLUSH); /* Lop off the unused portion */ - Dynarr_set_length (dst, Dynarr_length (dst) - data->stream.avail_out); + Dynarr_set_lengthr (dst, Dynarr_length (dst) - data->stream.avail_out); if (zerr != Z_OK) break; }