dovecot-2.2: lib-storage: Code cleanup: dbox_save_context.cur_fi...
dovecot at dovecot.org
dovecot at dovecot.org
Mon Nov 26 23:16:12 EET 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/7fb33baa8201
changeset: 15407:7fb33baa8201
user: Timo Sirainen <tss at iki.fi>
date: Mon Nov 26 23:15:01 2012 +0200
description:
lib-storage: Code cleanup: dbox_save_context.cur_file doesn't need to be in dbox-common.
diffstat:
src/lib-storage/index/dbox-common/dbox-save.h | 1 -
src/lib-storage/index/dbox-multi/mdbox-save.c | 5 +++--
src/lib-storage/index/dbox-single/sdbox-save.c | 6 ++++--
3 files changed, 7 insertions(+), 5 deletions(-)
diffs (74 lines):
diff -r d1bff2c44fe4 -r 7fb33baa8201 src/lib-storage/index/dbox-common/dbox-save.h
--- a/src/lib-storage/index/dbox-common/dbox-save.h Mon Nov 26 23:12:29 2012 +0200
+++ b/src/lib-storage/index/dbox-common/dbox-save.h Mon Nov 26 23:15:01 2012 +0200
@@ -12,7 +12,6 @@
struct istream *input;
struct mail *mail;
- struct dbox_file *cur_file;
struct ostream *dbox_output;
unsigned int failed:1;
diff -r d1bff2c44fe4 -r 7fb33baa8201 src/lib-storage/index/dbox-multi/mdbox-save.c
--- a/src/lib-storage/index/dbox-multi/mdbox-save.c Mon Nov 26 23:12:29 2012 +0200
+++ b/src/lib-storage/index/dbox-multi/mdbox-save.c Mon Nov 26 23:15:01 2012 +0200
@@ -32,6 +32,7 @@
struct mdbox_mailbox *mbox;
struct mdbox_sync_context *sync_ctx;
+ struct dbox_file *cur_file;
struct dbox_file_append_context *cur_file_append;
struct mdbox_map_append_context *append_ctx;
@@ -105,9 +106,9 @@
if (ctx != NULL) {
/* use the existing allocated structure */
+ ctx->cur_file = NULL;
ctx->ctx.failed = FALSE;
ctx->ctx.finished = FALSE;
- ctx->ctx.cur_file = NULL;
ctx->ctx.dbox_output = NULL;
ctx->cur_file_append = NULL;
return &ctx->ctx.ctx;
@@ -148,7 +149,7 @@
i_assert(ctx->ctx.dbox_output->offset <= (uint32_t)-1);
append_offset = ctx->ctx.dbox_output->offset;
- ctx->ctx.cur_file = ctx->cur_file_append->file;
+ ctx->cur_file = ctx->cur_file_append->file;
dbox_save_begin(&ctx->ctx, input);
save_mail = array_append_space(&ctx->mails);
diff -r d1bff2c44fe4 -r 7fb33baa8201 src/lib-storage/index/dbox-single/sdbox-save.c
--- a/src/lib-storage/index/dbox-single/sdbox-save.c Mon Nov 26 23:12:29 2012 +0200
+++ b/src/lib-storage/index/dbox-single/sdbox-save.c Mon Nov 26 23:15:01 2012 +0200
@@ -25,6 +25,8 @@
struct sdbox_mailbox *mbox;
struct sdbox_sync_context *sync_ctx;
+
+ struct dbox_file *cur_file;
struct dbox_file_append_context *append_ctx;
uint32_t first_saved_seq;
@@ -59,9 +61,9 @@
if (ctx != NULL) {
/* use the existing allocated structure */
+ ctx->cur_file = NULL;
ctx->ctx.failed = FALSE;
ctx->ctx.finished = FALSE;
- ctx->ctx.cur_file = NULL;
ctx->ctx.dbox_output = NULL;
return &ctx->ctx.ctx;
}
@@ -110,7 +112,7 @@
ctx->ctx.failed = TRUE;
return -1;
}
- ctx->ctx.cur_file = file;
+ ctx->cur_file = file;
dbox_save_begin(&ctx->ctx, input);
sdbox_save_add_file(_ctx, file);
More information about the dovecot-cvs
mailing list