# HG changeset patch
# User Damien Riegel <[email protected]>
# Date 1465338475 14400
#      Tue Jun 07 18:27:55 2016 -0400
# Node ID 2e7d6b93fa8463e76b116ae27cebe515f66677bb
# Parent  81958d1d70ebb753aee4c5925fdecd8ae0210256
add imap_commit_message function

Move IMAP operations that were done in mx_commit_message to a dedicated
imap_commit_message function.

diff -r 81958d1d70eb -r 2e7d6b93fa84 imap/imap.h
--- a/imap/imap.h       Tue Jun 07 18:20:20 2016 -0400
+++ b/imap/imap.h       Tue Jun 07 18:27:55 2016 -0400
@@ -58,6 +58,7 @@
 /* message.c */
 int imap_append_message (CONTEXT* ctx, MESSAGE* msg);
 int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete);
+int imap_commit_message (CONTEXT *ctx, MESSAGE *msg);
 
 /* socket.c */
 void imap_logout_all (void);
diff -r 81958d1d70eb -r 2e7d6b93fa84 imap/message.c
--- a/imap/message.c    Tue Jun 07 18:20:20 2016 -0400
+++ b/imap/message.c    Tue Jun 07 18:27:55 2016 -0400
@@ -600,6 +600,16 @@
   return safe_fclose (&msg->fp);
 }
 
+int imap_commit_message (CONTEXT *ctx, MESSAGE *msg)
+{
+  int r = safe_fclose (&msg->fp);
+
+  if (r)
+    return r;
+
+  return imap_append_message (ctx, msg);
+}
+
 int imap_append_message (CONTEXT *ctx, MESSAGE *msg)
 {
   IMAP_DATA* idata;
diff -r 81958d1d70eb -r 2e7d6b93fa84 mx.c
--- a/mx.c      Tue Jun 07 18:20:20 2016 -0400
+++ b/mx.c      Tue Jun 07 18:27:55 2016 -0400
@@ -1360,8 +1360,7 @@
 #ifdef USE_IMAP
     case MUTT_IMAP:
     {
-      if ((r = safe_fclose (&msg->fp)) == 0)
-       r = imap_append_message (ctx, msg);
+      r = imap_commit_message (ctx, msg);
       break;
     }
 #endif

Reply via email to