Mercurial > dovecot > original-hg > dovecot-1.2
changeset 7031:4b51ee73ed51 HEAD
Removed v_start_offset parameter from i_stream_create_limit(). We'll always
use input->v_offset now.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Sat, 22 Dec 2007 05:04:46 +0200 |
parents | 1a89a1509e81 |
children | 85cf52f0bc64 |
files | src/deliver/deliver.c src/imap/cmd-append.c src/imap/imap-fetch-body.c src/lib-storage/index/dbox/dbox-file.c src/lib-storage/index/dbox/dbox-sync-file.c src/lib-storage/index/mbox/mbox-mail.c src/lib-storage/index/mbox/mbox-sync-rewrite.c src/lib/istream-limit.c src/lib/istream.h |
diffstat | 9 files changed, 13 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/src/deliver/deliver.c Sat Dec 22 04:48:33 2007 +0200 +++ b/src/deliver/deliver.c Sat Dec 22 05:04:46 2007 +0200 @@ -559,8 +559,7 @@ input2 = input; i_stream_ref(input2); } else { - input2 = i_stream_create_limit(input, input->v_offset, - (uoff_t)-1); + input2 = i_stream_create_limit(input, (uoff_t)-1); } i_stream_unref(&input);
--- a/src/imap/cmd-append.c Sat Dec 22 04:48:33 2007 +0200 +++ b/src/imap/cmd-append.c Sat Dec 22 05:04:46 2007 +0200 @@ -191,9 +191,7 @@ /* we have to read the nonsynced literal so we don't treat the message data as commands. */ - ctx->input = i_stream_create_limit(ctx->client->input, - ctx->client->input->v_offset, - ctx->msg_size); + ctx->input = i_stream_create_limit(ctx->client->input, ctx->msg_size); ctx->message_input = TRUE; ctx->cmd->func = cmd_append_continue_cancel; @@ -330,9 +328,7 @@ } /* save the mail */ - ctx->input = i_stream_create_limit(client->input, - client->input->v_offset, - ctx->msg_size); + ctx->input = i_stream_create_limit(client->input, ctx->msg_size); ret = mailbox_save_init(ctx->t, flags, keywords, internal_date, timezone_offset, NULL, ctx->input, FALSE, &ctx->save_ctx);
--- a/src/imap/imap-fetch-body.c Sat Dec 22 04:48:33 2007 +0200 +++ b/src/imap/imap-fetch-body.c Sat Dec 22 05:04:46 2007 +0200 @@ -280,9 +280,7 @@ if (size->physical_size == size->virtual_size && ctx->cur_mail->has_no_nuls) { /* no need to kludge with CRs, we can use sendfile() */ - input = i_stream_create_limit(ctx->cur_input, - ctx->cur_input->v_offset, - ctx->cur_size); + input = i_stream_create_limit(ctx->cur_input, ctx->cur_size); i_stream_unref(&ctx->cur_input); ctx->cur_input = input;
--- a/src/lib-storage/index/dbox/dbox-file.c Sat Dec 22 04:48:33 2007 +0200 +++ b/src/lib-storage/index/dbox/dbox-file.c Sat Dec 22 05:04:46 2007 +0200 @@ -627,7 +627,6 @@ if (stream_r != NULL) { i_stream_seek(file->input, offset + file->msg_header_size); *stream_r = i_stream_create_limit(file->input, - file->input->v_offset, file->cur_physical_size); } *uid_r = file->cur_uid;
--- a/src/lib-storage/index/dbox/dbox-sync-file.c Sat Dec 22 04:48:33 2007 +0200 +++ b/src/lib-storage/index/dbox/dbox-sync-file.c Sat Dec 22 05:04:46 2007 +0200 @@ -140,7 +140,8 @@ break; } - input = i_stream_create_limit(file->input, offset, + i_stream_seek(file->input, offset); + input = i_stream_create_limit(file->input, file->msg_header_size + physical_size); ret = o_stream_send_istream(output, input) < 0 ? -1 : 0;
--- a/src/lib-storage/index/mbox/mbox-mail.c Sat Dec 22 04:48:33 2007 +0200 +++ b/src/lib-storage/index/mbox/mbox-mail.c Sat Dec 22 05:04:46 2007 +0200 @@ -235,8 +235,8 @@ raw_stream = mbox->mbox_stream; offset = istream_raw_mbox_get_header_offset(raw_stream); - raw_stream = i_stream_create_limit(raw_stream, - offset, (uoff_t)-1); + i_stream_seek(raw_stream, offset); + raw_stream = i_stream_create_limit(raw_stream, (uoff_t)-1); data->stream = i_stream_create_header_filter(raw_stream, HEADER_FILTER_EXCLUDE | HEADER_FILTER_NO_CR,
--- a/src/lib-storage/index/mbox/mbox-sync-rewrite.c Sat Dec 22 04:48:33 2007 +0200 +++ b/src/lib-storage/index/mbox/mbox-sync-rewrite.c Sat Dec 22 05:04:46 2007 +0200 @@ -35,7 +35,7 @@ return -1; } - input = i_stream_create_limit(sync_ctx->file_input, source, size); + input = i_stream_create_limit(sync_ctx->file_input, size); ret = o_stream_send_istream(output, input); i_stream_unref(&input);
--- a/src/lib/istream-limit.c Sat Dec 22 04:48:33 2007 +0200 +++ b/src/lib/istream-limit.c Sat Dec 22 05:04:46 2007 +0200 @@ -106,23 +106,17 @@ return &stream->statbuf; } -struct istream *i_stream_create_limit(struct istream *input, - uoff_t v_start_offset, uoff_t v_size) +struct istream *i_stream_create_limit(struct istream *input, uoff_t v_size) { struct limit_istream *lstream; i_stream_ref(input); lstream = i_new(struct limit_istream, 1); - lstream->v_start_offset = v_start_offset; + lstream->v_start_offset = input->v_offset; lstream->v_size = v_size; lstream->istream.max_buffer_size = input->real_stream->max_buffer_size; - lstream->istream.istream.v_offset = - input->v_offset < v_start_offset ? 0 : - input->v_offset - v_start_offset > v_size ? v_size : - input->v_offset - v_start_offset; - lstream->istream.iostream.destroy = i_stream_limit_destroy; lstream->istream.iostream.set_max_buffer_size = i_stream_limit_set_max_buffer_size; @@ -136,5 +130,5 @@ lstream->istream.istream.seekable = input->seekable; return i_stream_create(&lstream->istream, i_stream_get_fd(input), input->real_stream->abs_start_offset + - v_start_offset); + input->v_offset); }
--- a/src/lib/istream.h Sat Dec 22 04:48:33 2007 +0200 +++ b/src/lib/istream.h Sat Dec 22 05:04:46 2007 +0200 @@ -26,8 +26,7 @@ uoff_t start_offset, uoff_t v_size, bool autoclose_fd); struct istream *i_stream_create_from_data(const void *data, size_t size); -struct istream *i_stream_create_limit(struct istream *input, - uoff_t v_start_offset, uoff_t v_size); +struct istream *i_stream_create_limit(struct istream *input, uoff_t v_size); /* i_stream_close() + i_stream_unref() */ void i_stream_destroy(struct istream **stream);