From b9d46a5402f485e137b3b7d5ed385b9fefd01f0e Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Fri, 12 May 2017 13:35:06 +0300 Subject: [PATCH] lib-storage: Remove index_storage_save_continue It was not intended for v2.2 --- src/lib-storage/index/index-storage.c | 42 --------------------------- src/lib-storage/index/index-storage.h | 3 -- 2 files changed, 45 deletions(-) diff --git a/src/lib-storage/index/index-storage.c b/src/lib-storage/index/index-storage.c index 87549db6d2..9c4e7195b6 100644 --- a/src/lib-storage/index/index-storage.c +++ b/src/lib-storage/index/index-storage.c @@ -1073,48 +1073,6 @@ int index_storage_expunged_sync_begin(struct mailbox *box, return 1; } -int index_storage_save_continue(struct mail_save_context *ctx, - struct istream *input, - struct mail *cache_dest_mail) -{ - struct mail_storage *storage = ctx->transaction->box->storage; - - do { - switch (o_stream_send_istream(ctx->data.output, input)) { - case OSTREAM_SEND_ISTREAM_RESULT_FINISHED: - break; - case OSTREAM_SEND_ISTREAM_RESULT_WAIT_INPUT: - break; - case OSTREAM_SEND_ISTREAM_RESULT_WAIT_OUTPUT: - i_unreached(); - case OSTREAM_SEND_ISTREAM_RESULT_ERROR_INPUT: - /* handle below */ - break; - case OSTREAM_SEND_ISTREAM_RESULT_ERROR_OUTPUT: - if (!mail_storage_set_error_from_errno(storage)) { - mail_storage_set_critical(storage, - "save: write(%s) failed: %s", - o_stream_get_name(ctx->data.output), - o_stream_get_error(ctx->data.output)); - } - return -1; - } - if (cache_dest_mail != NULL) - index_mail_cache_parse_continue(cache_dest_mail); - - /* both tee input readers may consume data from our primary - input stream. we'll have to make sure we don't return with - one of the streams still having data in them. */ - } while (i_stream_read(input) > 0); - - if (input->stream_errno != 0) { - mail_storage_set_critical(storage, "save: read(%s) failed: %s", - i_stream_get_name(input), i_stream_get_error(input)); - return -1; - } - return 0; -} - void index_storage_save_abort_last(struct mail_save_context *ctx, uint32_t seq) { struct index_mail *imail = (struct index_mail *)ctx->dest_mail; diff --git a/src/lib-storage/index/index-storage.h b/src/lib-storage/index/index-storage.h index d6bd1c2ad2..28dc66d649 100644 --- a/src/lib-storage/index/index-storage.h +++ b/src/lib-storage/index/index-storage.h @@ -180,9 +180,6 @@ int index_storage_expunged_sync_begin(struct mailbox *box, enum mail_index_sync_flags flags); void index_storage_expunging_deinit(struct mailbox *box); -int index_storage_save_continue(struct mail_save_context *ctx, - struct istream *input, - struct mail *cache_dest_mail); void index_storage_save_abort_last(struct mail_save_context *ctx, uint32_t seq); #endif