Skip to content

Commit

Permalink
lib-sieve: Remove unnecessary mailbox_save_set_dest_mail() call
Browse files Browse the repository at this point in the history
  • Loading branch information
sirainen authored and GitLab committed Feb 14, 2017
1 parent 85c9de0 commit a1dbf7a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
12 changes: 0 additions & 12 deletions src/lib-sieve/sieve-actions.c
Expand Up @@ -566,12 +566,8 @@ static int act_store_execute
trans->mail_trans = mailbox_transaction_begin
(trans->box, MAILBOX_TRANSACTION_FLAG_EXTERNAL);

/* Create mail object for stored message */
trans->dest_mail = mail_alloc(trans->mail_trans, 0, NULL);

/* Store the message */
save_ctx = mailbox_save_alloc(trans->mail_trans);
mailbox_save_set_dest_mail(save_ctx, trans->dest_mail);

/* Apply keywords and flags that side-effects may have added */
if ( trans->flags_altered ) {
Expand Down Expand Up @@ -698,10 +694,6 @@ static int act_store_commit
*/
aenv->exec_status->last_storage = mailbox_get_storage(trans->box);

/* Free mail object for stored message */
if ( trans->dest_mail != NULL )
mail_free(&trans->dest_mail);

/* Commit mailbox transaction */
status = ( mailbox_transaction_commit(&trans->mail_trans) == 0 );

Expand Down Expand Up @@ -745,10 +737,6 @@ static void act_store_rollback
/* Log status */
act_store_log_status(trans, aenv, TRUE, success);

/* Free mailobject for stored message */
if ( trans->dest_mail != NULL )
mail_free(&trans->dest_mail);

/* Rollback mailbox transaction */
if ( trans->mail_trans != NULL )
mailbox_transaction_rollback(&trans->mail_trans);
Expand Down
1 change: 0 additions & 1 deletion src/lib-sieve/sieve-actions.h
Expand Up @@ -228,7 +228,6 @@ struct act_store_transaction {
struct act_store_context *context;
struct mailbox *box;
struct mailbox_transaction_context *mail_trans;
struct mail *dest_mail;

const char *error;
enum mail_error error_code;
Expand Down

0 comments on commit a1dbf7a

Please sign in to comment.