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 --git a/attach.c b/attach.c
index ab810ccc7d9ee198005e3519c11b71079e857ba2..84cdf6d14f8e1e40d9f94236227b436e5320d431 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -745,7 +745,7 @@ int mutt_save_attachment (FILE *fp, BODY *m, char *path, int flags, HEADER *hdr)
       else
        r = -1;
 
-      mx_close_message (&msg);
+      mx_close_message (&ctx, &msg);
       mx_close_mailbox (&ctx, NULL);
       return r;
     }

diff --git a/commands.c b/commands.c
index 4750121995e5228ecff5d70d9a50c1844d98564f..c5811bd4500733f2f1756062f0f51ae8e1d2b82c 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -993,7 +993,7 @@ static int _mutt_check_traditional_pgp (HEADER *h, int *redraw)
   }
   
   h->security |= PGP_TRADITIONAL_CHECKED;
-  mx_close_message (&msg);
+  mx_close_message (Context, &msg);
   return rv;
 }
 

diff --git a/copy.c b/copy.c
index 2ae5ea8ec2b228221de5b3f89f1b09742416b1a3..1ef441f44eb2842a386be6cf86acf67c6602fd55 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -692,7 +692,7 @@ mutt_copy_message (FILE *fpout, CONTEXT *src, HEADER *hdr, int flags,
     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 @@ _mutt_append_message (CONTEXT *dest, FILE *fpin, CONTEXT *src, HEADER *hdr,
   if (mx_commit_message (msg, dest) != 0)
     r = -1;
 
-  mx_close_message (&msg);
+  mx_close_message (dest, &msg);
   return r;
 }
 
@@ -742,7 +742,7 @@ mutt_append_message (CONTEXT *dest, CONTEXT *src, HEADER *hdr, int cmflags,
   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 --git a/editmsg.c b/editmsg.c
index 5a2e8f5552b635aee902ccdf0111ad01e6bc34ad..57d8b1ca1495135d029d6c1bf239f1bb99f9e73d 100644 (file)
--- a/editmsg.c
+++ b/editmsg.c
@@ -187,7 +187,7 @@ static int edit_one_message (CONTEXT *ctx, HEADER *cur)
   }
 
   rc = mx_commit_message (msg, &tmpctx);
-  mx_close_message (&msg);
+  mx_close_message (&tmpctx, &msg);
   
   mx_close_mailbox (&tmpctx, NULL);
   

diff --git a/mailbox.h b/mailbox.h
index a0c52387711b911f93f08790816a6784044db6ba..c8939d47ed3f65dc4902b7a8ffebf9345e0a385c 100644 (file)
--- a/mailbox.h
+++ b/mailbox.h
@@ -66,7 +66,7 @@ void mx_fastclose_mailbox (CONTEXT *);
 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 --git a/mh.c b/mh.c
index 3a0adcc1331429e1fedac14cdf6bcd3905a2db4e..45496508ee58a4b90f677eacc1481952d456f21e 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -1656,7 +1656,7 @@ static int mh_rewrite_message (CONTEXT * ctx, int msgno)
     else
       rc = _mh_commit_message (ctx, dest, h, 0);
 
-    mx_close_message (&dest);
+    mx_close_message (ctx, &dest);
 
     if (rc == 0)
     {
@@ -1687,7 +1687,7 @@ static int mh_rewrite_message (CONTEXT * ctx, int msgno)
     }
   }
   else
-    mx_close_message (&dest);
+    mx_close_message (ctx, &dest);
 
   if (rc == -1 && restore)
   {

diff --git a/mx.c b/mx.c
index 8e5b57e7845a45a21682bea055fc0451777cba93..bcb3a6bcfbb820f85f5526a3671450cc44f16c03 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -1389,7 +1389,7 @@ int mx_commit_message (MESSAGE *msg, CONTEXT *ctx)
 }
 
 /* close a pointer to a message */
-int mx_close_message (MESSAGE **msg)
+int mx_close_message (CONTEXT *ctx, MESSAGE **msg)
 {
   int r = 0;
 

diff --git a/parse.c b/parse.c
index 9ff87078d508477396847ba44d756bab7368f16d..92cfeb0ffa25ce8433fb15ac91f32daef92ee0f7 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -969,7 +969,7 @@ void mutt_parse_mime_message (CONTEXT *ctx, HEADER *cur)
       if (WithCrypto)
         cur->security = crypt_query (cur->content);
 
-      mx_close_message (&msg);
+      mx_close_message (ctx, &msg);
     }
   } while (0);
 

diff --git a/pattern.c b/pattern.c
index 09cf315df5595acef45c0a8d377e8df6686fe1b6..ef3cf01a4ae52d602cb52f32456e32914b8cf965 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -180,7 +180,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
        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 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
 
     FREE (&buf);
     
-    mx_close_message (&msg);
+    mx_close_message (ctx, &msg);
 
     if (option (OPTTHOROUGHSRC))
     {

diff --git a/pop.c b/pop.c
index 15c997926fd2d8600500a2c9153c22b1d1643196..bccdc9b9039c48e41322f48c5c6c950c450ec118 100644 (file)
--- a/pop.c
+++ b/pop.c
@@ -874,7 +874,7 @@ void pop_fetch_mail (void)
        ret = -3;
       }
 
-      mx_close_message (&msg);
+      mx_close_message (&ctx, &msg);
     }
 
     if (ret == 0 && delanswer == MUTT_YES)

diff --git a/postpone.c b/postpone.c
index f7a7a87ffb439cce34c7b5d45d31b9f38a83a899..9e19da2cd2941a8b580049c5273df5ececc4e5e8 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -586,7 +586,7 @@ int mutt_prepare_template (FILE *fp, CONTEXT *ctx, HEADER *newhdr, HEADER *hdr,
        || 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 @@ int mutt_prepare_template (FILE *fp, CONTEXT *ctx, HEADER *newhdr, HEADER *hdr,
 
   /* 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 --git a/recvattach.c b/recvattach.c
index c709c061a5bfd93ff91d74170458e085e4d19fc6..fb31318896dd7efc826c192c1c46856b335643b1 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -966,7 +966,7 @@ void mutt_view_attachments (HEADER *hdr)
 
     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 @@ void mutt_view_attachments (HEADER *hdr)
 
     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 @@ void mutt_view_attachments (HEADER *hdr)
        break;
 
       case OP_EXIT:
-       mx_close_message (&msg);
+       mx_close_message (Context, &msg);
        hdr->attach_del = 0;
        while (idxmax-- > 0)
        {

diff --git a/sendlib.c b/sendlib.c
index ee4752533755d9d1c45cd3ee500182a68a10fb99..939919caf36621f4327c215e9ccd7c2837a21436 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -2573,7 +2573,7 @@ static int _mutt_bounce_message (FILE *fp, HEADER *h, ADDRESS *to, const char *r
   }
 
   if (msg)
-    mx_close_message (&msg);
+    mx_close_message (Context, &msg);
 
   return ret;
 }
@@ -2847,7 +2847,7 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post,
       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 @@ int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post,
 
   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)