# HG changeset patch
# User Damien Riegel <[email protected]>
# Date 1464825833 14400
# Wed Jun 01 20:03:53 2016 -0400
# Node ID 5c7e9fa91676651fed2c18efe8b4aed85ff97ab9
# Parent 837e6ea2638bf6d4d6e9a9c5dce779f46a5d75d9
pass context in mx_close_message
The mx_close_message is one of the few mx_* functions that don't have a
context as parameter. To make them more consistent, pass the context.
diff -r 837e6ea2638b -r 5c7e9fa91676 attach.c
--- a/attach.c Wed Jun 01 19:08:23 2016 -0400
+++ b/attach.c Wed Jun 01 20:03:53 2016 -0400
@@ -745,7 +745,7 @@
else
r = -1;
- mx_close_message (&msg);
+ mx_close_message (&ctx, &msg);
mx_close_mailbox (&ctx, NULL);
return r;
}
diff -r 837e6ea2638b -r 5c7e9fa91676 commands.c
--- a/commands.c Wed Jun 01 19:08:23 2016 -0400
+++ b/commands.c Wed Jun 01 20:03:53 2016 -0400
@@ -993,7 +993,7 @@
}
h->security |= PGP_TRADITIONAL_CHECKED;
- mx_close_message (&msg);
+ mx_close_message (Context, &msg);
return rv;
}
diff -r 837e6ea2638b -r 5c7e9fa91676 copy.c
--- a/copy.c Wed Jun 01 19:08:23 2016 -0400
+++ b/copy.c Wed Jun 01 20:03:53 2016 -0400
@@ -692,7 +692,7 @@
dprint (1, (debugfile, "_mutt_copy_message failed to detect EOF!\n"));
r = -1;
}
- mx_close_message (&msg);
+ mx_close_message (src, &msg);
return r;
}
@@ -728,7 +728,7 @@
if (mx_commit_message (msg, dest) != 0)
r = -1;
- mx_close_message (&msg);
+ mx_close_message (dest, &msg);
return r;
}
@@ -742,7 +742,7 @@
if ((msg = mx_open_message (src, hdr->msgno)) == NULL)
return -1;
r = _mutt_append_message (dest, msg->fp, src, hdr, hdr->content, cmflags,
chflags);
- mx_close_message (&msg);
+ mx_close_message (src, &msg);
return r;
}
diff -r 837e6ea2638b -r 5c7e9fa91676 editmsg.c
--- a/editmsg.c Wed Jun 01 19:08:23 2016 -0400
+++ b/editmsg.c Wed Jun 01 20:03:53 2016 -0400
@@ -187,7 +187,7 @@
}
rc = mx_commit_message (msg, &tmpctx);
- mx_close_message (&msg);
+ mx_close_message (&tmpctx, &msg);
mx_close_mailbox (&tmpctx, NULL);
diff -r 837e6ea2638b -r 5c7e9fa91676 mailbox.h
--- a/mailbox.h Wed Jun 01 19:08:23 2016 -0400
+++ b/mailbox.h Wed Jun 01 20:03:53 2016 -0400
@@ -69,7 +69,7 @@
int mx_close_mailbox (CONTEXT *, int *);
int mx_sync_mailbox (CONTEXT *, int *);
int mx_commit_message (MESSAGE *, CONTEXT *);
-int mx_close_message (MESSAGE **);
+int mx_close_message (CONTEXT *, MESSAGE **);
int mx_get_magic (const char *);
int mx_set_magic (const char *);
int mx_check_mailbox (CONTEXT *, int *);
diff -r 837e6ea2638b -r 5c7e9fa91676 mh.c
--- a/mh.c Wed Jun 01 19:08:23 2016 -0400
+++ b/mh.c Wed Jun 01 20:03:53 2016 -0400
@@ -1642,7 +1642,7 @@
else
rc = _mh_commit_message (ctx, dest, h, 0);
- mx_close_message (&dest);
+ mx_close_message (ctx, &dest);
if (rc == 0)
{
@@ -1673,7 +1673,7 @@
}
}
else
- mx_close_message (&dest);
+ mx_close_message (ctx, &dest);
if (rc == -1 && restore)
{
diff -r 837e6ea2638b -r 5c7e9fa91676 mx.c
--- a/mx.c Wed Jun 01 19:08:23 2016 -0400
+++ b/mx.c Wed Jun 01 20:03:53 2016 -0400
@@ -1393,7 +1393,7 @@
}
/* close a pointer to a message */
-int mx_close_message (MESSAGE **msg)
+int mx_close_message (CONTEXT *ctx, MESSAGE **msg)
{
int r = 0;
diff -r 837e6ea2638b -r 5c7e9fa91676 parse.c
--- a/parse.c Wed Jun 01 19:08:23 2016 -0400
+++ b/parse.c Wed Jun 01 20:03:53 2016 -0400
@@ -969,7 +969,7 @@
if (WithCrypto)
cur->security = crypt_query (cur->content);
- mx_close_message (&msg);
+ mx_close_message (ctx, &msg);
}
} while (0);
diff -r 837e6ea2638b -r 5c7e9fa91676 pattern.c
--- a/pattern.c Wed Jun 01 19:08:23 2016 -0400
+++ b/pattern.c Wed Jun 01 20:03:53 2016 -0400
@@ -180,7 +180,7 @@
if (WithCrypto && (h->security & ENCRYPT)
&& !crypt_valid_passphrase(h->security))
{
- mx_close_message (&msg);
+ mx_close_message (ctx, &msg);
if (s.fpout)
{
safe_fclose (&s.fpout);
@@ -239,7 +239,7 @@
FREE (&buf);
- mx_close_message (&msg);
+ mx_close_message (ctx, &msg);
if (option (OPTTHOROUGHSRC))
{
diff -r 837e6ea2638b -r 5c7e9fa91676 pop.c
--- a/pop.c Wed Jun 01 19:08:23 2016 -0400
+++ b/pop.c Wed Jun 01 20:03:53 2016 -0400
@@ -874,7 +874,7 @@
ret = -3;
}
- mx_close_message (&msg);
+ mx_close_message (&ctx, &msg);
}
if (ret == 0 && delanswer == MUTT_YES)
diff -r 837e6ea2638b -r 5c7e9fa91676 postpone.c
--- a/postpone.c Wed Jun 01 19:08:23 2016 -0400
+++ b/postpone.c Wed Jun 01 20:03:53 2016 -0400
@@ -586,7 +586,7 @@
|| b == NULL)
{
err:
- mx_close_message (&msg);
+ mx_close_message (ctx, &msg);
mutt_free_envelope (&newhdr->env);
mutt_free_body (&newhdr->content);
mutt_error _("Decryption failed.");
@@ -735,7 +735,7 @@
/* that's it. */
if (bfp != fp) safe_fclose (&bfp);
- if (msg) mx_close_message (&msg);
+ if (msg) mx_close_message (ctx, &msg);
if (rv == -1)
{
diff -r 837e6ea2638b -r 5c7e9fa91676 recvattach.c
--- a/recvattach.c Wed Jun 01 19:08:23 2016 -0400
+++ b/recvattach.c Wed Jun 01 20:03:53 2016 -0400
@@ -966,7 +966,7 @@
if ((hdr->security & ENCRYPT) && !crypt_valid_passphrase(hdr->security))
{
- mx_close_message (&msg);
+ mx_close_message (Context, &msg);
return;
}
if ((WithCrypto & APPLICATION_SMIME) && (hdr->security &
APPLICATION_SMIME))
@@ -1006,7 +1006,7 @@
if (need_secured && !secured)
{
- mx_close_message (&msg);
+ mx_close_message (Context, &msg);
mutt_error _("Can't decrypt encrypted message!");
return;
}
@@ -1239,7 +1239,7 @@
break;
case OP_EXIT:
- mx_close_message (&msg);
+ mx_close_message (Context, &msg);
hdr->attach_del = 0;
while (idxmax-- > 0)
{
diff -r 837e6ea2638b -r 5c7e9fa91676 sendlib.c
--- a/sendlib.c Wed Jun 01 19:08:23 2016 -0400
+++ b/sendlib.c Wed Jun 01 20:03:53 2016 -0400
@@ -2573,7 +2573,7 @@
}
if (msg)
- mx_close_message (&msg);
+ mx_close_message (Context, &msg);
return ret;
}
@@ -2847,7 +2847,7 @@
safe_fclose (&tempfp);
unlink (tempfile);
mx_commit_message (msg, &f); /* XXX - really? */
- mx_close_message (&msg);
+ mx_close_message (&f, &msg);
mx_close_mailbox (&f, NULL);
return -1;
}
@@ -2876,7 +2876,7 @@
if (mx_commit_message (msg, &f) != 0)
r = -1;
- mx_close_message (&msg);
+ mx_close_message (&f, &msg);
mx_close_mailbox (&f, NULL);
if (!post && need_buffy_cleanup)
