[PATCH 2 of 3] mx_check_mailbox: remove lock argument in function call

[Damien Riegel]

# HG changeset patch
# User Damien Riegel <dam...@riegel.io>
# Date 1464135849 14400
#      Tue May 24 20:24:09 2016 -0400
# Node ID d18efeecb6d3bf1d176cad8a14071a0aefadcd41
# Parent  26d6dbbbe6bfc9dfb7629f0ba6008eb76c073b5f
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 -r 26d6dbbbe6bf -r d18efeecb6d3 curs_main.c
--- a/curs_main.c       Tue May 24 20:12:01 2016 -0400
+++ b/curs_main.c       Tue May 24 20:24:09 2016 -0400
@@ -549,7 +549,7 @@
 
       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 -r 26d6dbbbe6bf -r d18efeecb6d3 mailbox.h
--- a/mailbox.h Tue May 24 20:12:01 2016 -0400
+++ b/mailbox.h Tue May 24 20:24:09 2016 -0400
@@ -69,7 +69,7 @@
 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 -r 26d6dbbbe6bf -r d18efeecb6d3 mx.c
--- a/mx.c      Tue May 24 20:12:01 2016 -0400
+++ b/mx.c      Tue May 24 20:24:09 2016 -0400
@@ -1259,40 +1259,15 @@
 }
 
 /* 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: