mx_check_mailbox: remove lock argument in function call

This function is only called in one place with lock = 0. Basically, all
code under if (lock) is dead code, so we can remove it, making the
function simpler to factorize.

diff --git a/curs_main.c b/curs_main.c
index d49b73e61b2083c6f01bb6c3bd9a2e66ade12198..f5ac2458cde26d724cb20bf31507bd5c3b2e6bb6 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -549,7 +549,7 @@ int mutt_index_menu (void)
 
       index_hint = (Context->vcount && menu->current >= 0 && menu->current < Context->vcount) ? CURHDR->index : 0;
 
-      if ((check = mx_check_mailbox (Context, &index_hint, 0)) < 0)
+      if ((check = mx_check_mailbox (Context, &index_hint)) < 0)
       {
        if (!Context->path)
        {

diff --git a/mailbox.h b/mailbox.h
index f61e5865f6d609424b4b80b07a5c58e0b1b8825c..8d35c4d6d2bb272c17f8cdc155681f275da6d451 100644 (file)
--- a/mailbox.h
+++ b/mailbox.h
@@ -69,7 +69,7 @@ int mx_commit_message (MESSAGE *, CONTEXT *);
 int mx_close_message (MESSAGE **);
 int mx_get_magic (const char *);
 int mx_set_magic (const char *);
-int mx_check_mailbox (CONTEXT *, int *, int);
+int mx_check_mailbox (CONTEXT *, int *);
 #ifdef USE_IMAP
 int mx_is_imap (const char *);
 #endif

diff --git a/mx.c b/mx.c
index cf50d538a4dd591ecc4f2bc6f42ba5d0aef851c9..f8d27aba4d6d4764c95659f97cf6c989d59921f9 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -1262,40 +1262,15 @@ MESSAGE *mx_open_new_message (CONTEXT *dest, HEADER *hdr, int flags)
 }
 
 /* check for new mail */
-int mx_check_mailbox (CONTEXT *ctx, int *index_hint, int lock)
+int mx_check_mailbox (CONTEXT *ctx, int *index_hint)
 {
-  int rc;
-
   if (ctx)
   {
-    if (ctx->locked) lock = 0;
-
     switch (ctx->magic)
     {
       case MUTT_MBOX:
       case MUTT_MMDF:
-
-       if (lock)
-       {
-         mutt_block_signals ();
-         if (mbox_lock_mailbox (ctx, 0, 0) == -1)
-         {
-           mutt_unblock_signals ();
-           return MUTT_LOCKED;
-         }
-       }
-       
-       rc = mbox_check_mailbox (ctx, index_hint);
-
-       if (lock)
-       {
-         mutt_unblock_signals ();
-         mbox_unlock_mailbox (ctx);
-       }
-       
-       return rc;
-
-
+        return mbox_check_mailbox (ctx, index_hint);
       case MUTT_MH:
        return (mh_check_mailbox (ctx, index_hint));
       case MUTT_MAILDIR: