From b8e85418edf84b76a8f09b181fc7a57b50775004 Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Wed, 27 Mar 2019 23:55:16 +0000
Subject: [PATCH] tidy maildir_move_to_mailbox

---
 maildir/maildir_private.h |  2 +-
 maildir/shared.c          | 63 ++++++++++++++++-----------------------
 2 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/maildir/maildir_private.h b/maildir/maildir_private.h
index 23de4a6b3..585a11dad 100644
--- a/maildir/maildir_private.h
+++ b/maildir/maildir_private.h
@@ -93,7 +93,7 @@ void                    maildir_delayed_parsing(struct Mailbox *m, struct Maildi
 size_t                  maildir_hcache_keylen  (const char *fn);
 struct MaildirMboxData *maildir_mdata_get      (struct Mailbox *m);
 int                     maildir_mh_open_message(struct Mailbox *m, struct Message *msg, int msgno, bool is_maildir);
-int                     maildir_move_to_mailbox(struct Mailbox *m, struct Maildir **md);
+int                     maildir_move_to_mailbox(struct Mailbox *m, struct Maildir **ptr);
 int                     maildir_parse_dir      (struct Mailbox *m, struct Maildir ***last, const char *subdir, int *count, struct Progress *progress);
 void                    maildir_parse_flags    (struct Email *e, const char *path);
 struct Email *          maildir_parse_message  (enum MailboxType magic, const char *fname, bool is_old, struct Email *e);
diff --git a/maildir/shared.c b/maildir/shared.c
index 4cf4b96e9..617886a9a 100644
--- a/maildir/shared.c
+++ b/maildir/shared.c
@@ -412,17 +412,18 @@ cleanup:
 }
 
 /**
- * maildir_add_to_mailbox - Add the Maildir list to the Mailbox
- * @param m   Mailbox
- * @param md  Maildir list to copy
+ * maildir_move_to_mailbox - Copy the Maildir list to the Mailbox
+ * @param[in]  m   Mailbox
+ * @param[out] ptr Maildir list to copy, then free
  * @retval num Number of new emails
  * @retval 0   Error
  */
-static int maildir_add_to_mailbox(struct Mailbox *m, struct Maildir *md)
+int maildir_move_to_mailbox(struct Mailbox *m, struct Maildir **ptr)
 {
   if (!m)
     return 0;
 
+  struct Maildir *md = *ptr;
   int oldmsgcount = m->msg_count;
 
   if (!m->emails)
@@ -434,47 +435,33 @@ static int maildir_add_to_mailbox(struct Mailbox *m, struct Maildir *md)
     mx_alloc_memory(m);
   }
 
-  while (md)
+  for (; md; md = md->next)
   {
     mutt_debug(LL_DEBUG2, "Considering %s\n", NONULL(md->canon_fname));
+    if (!md->email)
+      continue;
 
-    if (md->email)
-    {
-      mutt_debug(LL_DEBUG2, "Adding header structure. Flags: %s%s%s%s%s\n",
-                 md->email->flagged ? "f" : "", md->email->deleted ? "D" : "",
-                 md->email->replied ? "r" : "", md->email->old ? "O" : "",
-                 md->email->read ? "R" : "");
-      if (m->msg_count == m->email_max)
-        mx_alloc_memory(m);
-
-      m->emails[m->msg_count] = md->email;
-      m->emails[m->msg_count]->index = m->msg_count;
-      m->size += md->email->content->length + md->email->content->offset -
-                 md->email->content->hdr_offset;
-
-      md->email = NULL;
-      m->msg_count++;
-    }
-    md = md->next;
+    mutt_debug(LL_DEBUG2, "Adding header structure. Flags: %s%s%s%s%s\n",
+                md->email->flagged ? "f" : "", md->email->deleted ? "D" : "",
+                md->email->replied ? "r" : "", md->email->old ? "O" : "",
+                md->email->read ? "R" : "");
+    if (m->msg_count == m->email_max)
+      mx_alloc_memory(m);
+
+    m->emails[m->msg_count] = md->email;
+    m->emails[m->msg_count]->index = m->msg_count;
+    m->size += md->email->content->length + md->email->content->offset -
+                md->email->content->hdr_offset;
+
+    md->email = NULL;
+    m->msg_count++;
   }
 
+  int num = 0;
   if (m->msg_count > oldmsgcount)
-    return m->msg_count - oldmsgcount;
-
-  return 0;
-}
+    num = m->msg_count - oldmsgcount;
 
-/**
- * maildir_move_to_mailbox - Copy the Maildir list to the Mailbox
- * @param[in]  m   Mailbox
- * @param[out] md  Maildir list to copy, then free
- * @retval num Number of new emails
- * @retval 0   Error
- */
-int maildir_move_to_mailbox(struct Mailbox *m, struct Maildir **md)
-{
-  int num = maildir_add_to_mailbox(m, *md);
-  maildir_free_maildir(md);
+  maildir_free_maildir(ptr);
   return num;
 }
 
-- 
2.49.0