tidy conditionals 1

- move true condition first
- flatten 'else' clause when 'if' clause returns/breaks
- compare int functions to zero

diff --git a/color.c b/color.c
index 7ed29a83112a087df880dfffe5c44aa0275f2163..770f95ce341b9f6828ef726320099e1c08f0257e 100644 (file)
--- a/color.c
+++ b/color.c
@@ -1151,9 +1151,8 @@ static int fgbgattr_to_color(struct Colors *c, int fg, int bg, int attr)
 #ifdef HAVE_COLOR
   if ((fg != COLOR_UNSET) && (bg != COLOR_UNSET))
     return attr | mutt_color_alloc(c, fg, bg);
-  else
 #endif
-    return attr;
+  return attr;
 }
 
 /**

diff --git a/compose.c b/compose.c
index b4a57d8f9e5fc6952655ffdc879e37b135c35503..db974fa899042d41774b4c8fc878e4f44d50eb57 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -1409,20 +1409,19 @@ int mutt_compose_menu(struct Email *e, struct Buffer *fcc, struct Email *e_cur,
               }
             }
 
-            /* append bptr to the alts list,
-             * and remove from the e->content list */
-            if (!alts)
+            // append bptr to the alts list, and remove from the e->content list
+            if (alts)
             {
-              group->parts = bptr;
-              alts = bptr;
+              alts->next = bptr;
               bptr = bptr->next;
+              alts = alts->next;
               alts->next = NULL;
             }
             else
             {
-              alts->next = bptr;
+              group->parts = bptr;
+              alts = bptr;
               bptr = bptr->next;
-              alts = alts->next;
               alts->next = NULL;
             }
 
@@ -1507,20 +1506,19 @@ int mutt_compose_menu(struct Email *e, struct Buffer *fcc, struct Email *e_cur,
               }
             }
 
-            /* append bptr to the alts list,
-             * and remove from the e->content list */
-            if (!alts)
+            // append bptr to the alts list, and remove from the e->content list
+            if (alts)
             {
-              group->parts = bptr;
-              alts = bptr;
+              alts->next = bptr;
               bptr = bptr->next;
+              alts = alts->next;
               alts->next = NULL;
             }
             else
             {
-              alts->next = bptr;
+              group->parts = bptr;
+              alts = bptr;
               bptr = bptr->next;
-              alts = alts->next;
               alts->next = NULL;
             }
 

diff --git a/compress.c b/compress.c
index ded39fce32ce9b83c4271e7ad293a33b211957b9..064ef7ea56c541c306b52c9041ea7673fcda2e3f 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -402,8 +402,8 @@ bool mutt_comp_can_read(const char *path)
 
   if (find_hook(MUTT_OPEN_HOOK, path))
     return true;
-  else
-    return false;
+
+  return false;
 }
 
 /**

diff --git a/conn/ssl.c b/conn/ssl.c
index 80e3238c6c3be23adef001b86eac56d4ffa6744d..4017fb295981a5f17155651a82f92ac5832fc259 100644 (file)
--- a/conn/ssl.c
+++ b/conn/ssl.c
@@ -537,13 +537,9 @@ static bool hostname_match(const char *hostname, const char *certname)
     cmp1 = certname + 2;
     cmp2 = strchr(hostname, '.');
     if (!cmp2)
-    {
       return false;
-    }
-    else
-    {
-      cmp2++;
-    }
+
+    cmp2++;
   }
   else
   {
@@ -1353,8 +1349,8 @@ static int ssl_socket_poll(struct Connection *conn, time_t wait_secs)
 
   if (SSL_has_pending(data->ssl))
     return 1;
-  else
-    return raw_socket_poll(conn, wait_secs);
+
+  return raw_socket_poll(conn, wait_secs);
 }
 
 /**

diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c
index 98e12bf5a910f8a6e62f98bbbd741325650df187..dfadce39d20a47a9040622ae5739dc40f676e295 100644 (file)
--- a/conn/ssl_gnutls.c
+++ b/conn/ssl_gnutls.c
@@ -813,8 +813,7 @@ static int tls_check_certificate(struct Connection *conn)
     {
       if (preauthrc == 0)
         return 1;
-      else
-        break;
+      break;
     }
   }
 
@@ -1143,8 +1142,8 @@ static int tls_socket_poll(struct Connection *conn, time_t wait_secs)
 
   if (gnutls_record_check_pending(data->state))
     return 1;
-  else
-    return raw_socket_poll(conn, wait_secs);
+
+  return raw_socket_poll(conn, wait_secs);
 }
 
 /**

diff --git a/doc/makedoc.c b/doc/makedoc.c
index 73a4dd541049f12fa9db494355dce5e2bff2d17c..b7fd7a742bc4100655169474fb097d200e8cdd82 100644 (file)
--- a/doc/makedoc.c
+++ b/doc/makedoc.c
@@ -827,19 +827,19 @@ static int handle_docline(char *l, FILE *out, int docstat)
 
   if (strncmp(l, ".pp", 3) == 0)
     return print_it(SP_NEWPAR, NULL, out, docstat);
-  else if (strncmp(l, ".ts", 3) == 0)
+  if (strncmp(l, ".ts", 3) == 0)
     return print_it(SP_START_TAB, NULL, out, docstat);
-  else if (strncmp(l, ".te", 3) == 0)
+  if (strncmp(l, ".te", 3) == 0)
     return print_it(SP_END_TAB, NULL, out, docstat);
-  else if (strncmp(l, ".dl", 3) == 0)
+  if (strncmp(l, ".dl", 3) == 0)
     return print_it(SP_START_DL, NULL, out, docstat);
-  else if (strncmp(l, ".de", 3) == 0)
+  if (strncmp(l, ".de", 3) == 0)
     return print_it(SP_END_DL, NULL, out, docstat);
-  else if (strncmp(l, ".il", 3) == 0)
+  if (strncmp(l, ".il", 3) == 0)
     return print_it(SP_START_IL, NULL, out, docstat);
-  else if (strncmp(l, ".ie", 3) == 0)
+  if (strncmp(l, ".ie", 3) == 0)
     return print_it(SP_END_IL, NULL, out, docstat);
-  else if (strncmp(l, ". ", 2) == 0)
+  if (strncmp(l, ". ", 2) == 0)
     *l = ' ';
 
   for (s = l, d = buf; *s; s++)

diff --git a/email/email.c b/email/email.c
index 8d44603be1fc00e307a99fb9fb669cce5e50796a..8786125eeab8a0dc624655c4dfdb95be58268792 100644 (file)
--- a/email/email.c
+++ b/email/email.c
@@ -94,15 +94,11 @@ bool email_cmp_strict(const struct Email *e1, const struct Email *e2)
     {
       return false;
     }
-    else
-      return true;
+    return true;
   }
   else
   {
-    if (!e1 && !e2)
-      return true;
-    else
-      return false;
+    return (!e1 && !e2);
   }
 }
 

diff --git a/email/envelope.c b/email/envelope.c
index 3c7a3ea8eadb2f956183dc90103b27a7a1eec918..ab3e8414a28882dab40c5e80418c42937a2e9861 100644 (file)
--- a/email/envelope.c
+++ b/email/envelope.c
@@ -258,10 +258,7 @@ bool mutt_env_cmp_strict(const struct Envelope *e1, const struct Envelope *e2)
   }
   else
   {
-    if (!e1 && !e2)
-      return true;
-    else
-      return false;
+    return (!e1 && !e2);
   }
 }
 

diff --git a/email/parse.c b/email/parse.c
index 24709547cdfabff964c07a910031f128d3930884..8ebd84cc51ce36ab54ed1863d98fd1f707dafea7 100644 (file)
--- a/email/parse.c
+++ b/email/parse.c
@@ -318,30 +318,30 @@ enum ContentType mutt_check_mime_type(const char *s)
 {
   if (mutt_str_strcasecmp("text", s) == 0)
     return TYPE_TEXT;
-  else if (mutt_str_strcasecmp("multipart", s) == 0)
+  if (mutt_str_strcasecmp("multipart", s) == 0)
     return TYPE_MULTIPART;
 #ifdef SUN_ATTACHMENT
-  else if (mutt_str_strcasecmp("x-sun-attachment", s) == 0)
+  if (mutt_str_strcasecmp("x-sun-attachment", s) == 0)
     return TYPE_MULTIPART;
 #endif
-  else if (mutt_str_strcasecmp("application", s) == 0)
+  if (mutt_str_strcasecmp("application", s) == 0)
     return TYPE_APPLICATION;
-  else if (mutt_str_strcasecmp("message", s) == 0)
+  if (mutt_str_strcasecmp("message", s) == 0)
     return TYPE_MESSAGE;
-  else if (mutt_str_strcasecmp("image", s) == 0)
+  if (mutt_str_strcasecmp("image", s) == 0)
     return TYPE_IMAGE;
-  else if (mutt_str_strcasecmp("audio", s) == 0)
+  if (mutt_str_strcasecmp("audio", s) == 0)
     return TYPE_AUDIO;
-  else if (mutt_str_strcasecmp("video", s) == 0)
+  if (mutt_str_strcasecmp("video", s) == 0)
     return TYPE_VIDEO;
-  else if (mutt_str_strcasecmp("model", s) == 0)
+  if (mutt_str_strcasecmp("model", s) == 0)
     return TYPE_MODEL;
-  else if (mutt_str_strcasecmp("*", s) == 0)
+  if (mutt_str_strcasecmp("*", s) == 0)
     return TYPE_ANY;
-  else if (mutt_str_strcasecmp(".*", s) == 0)
+  if (mutt_str_strcasecmp(".*", s) == 0)
     return TYPE_ANY;
-  else
-    return TYPE_OTHER;
+
+  return TYPE_OTHER;
 }
 
 /**
@@ -427,22 +427,21 @@ int mutt_check_encoding(const char *c)
 {
   if (mutt_str_startswith(c, "7bit", CASE_IGNORE))
     return ENC_7BIT;
-  else if (mutt_str_startswith(c, "8bit", CASE_IGNORE))
+  if (mutt_str_startswith(c, "8bit", CASE_IGNORE))
     return ENC_8BIT;
-  else if (mutt_str_startswith(c, "binary", CASE_IGNORE))
+  if (mutt_str_startswith(c, "binary", CASE_IGNORE))
     return ENC_BINARY;
-  else if (mutt_str_startswith(c, "quoted-printable", CASE_IGNORE))
+  if (mutt_str_startswith(c, "quoted-printable", CASE_IGNORE))
     return ENC_QUOTED_PRINTABLE;
-  else if (mutt_str_startswith(c, "base64", CASE_IGNORE))
+  if (mutt_str_startswith(c, "base64", CASE_IGNORE))
     return ENC_BASE64;
-  else if (mutt_str_startswith(c, "x-uuencode", CASE_IGNORE))
+  if (mutt_str_startswith(c, "x-uuencode", CASE_IGNORE))
     return ENC_UUENCODED;
 #ifdef SUN_ATTACHMENT
-  else if (mutt_str_startswith(c, "uuencode", CASE_IGNORE))
+  if (mutt_str_startswith(c, "uuencode", CASE_IGNORE))
     return ENC_UUENCODED;
 #endif
-  else
-    return ENC_OTHER;
+  return ENC_OTHER;
 }
 
 /**

diff --git a/email/rfc2231.c b/email/rfc2231.c
index aa6419d3b16948f23027c0e7927af0445561ad77..6b91bf4826b0d44f679fbf512c123734a9b8ed4a 100644 (file)
--- a/email/rfc2231.c
+++ b/email/rfc2231.c
@@ -99,8 +99,7 @@ static char *get_charset(char *value, char *charset, size_t chslen)
   char *u = strchr(t + 1, '\'');
   if (u)
     return u + 1;
-  else
-    return t + 1;
+  return t + 1;
 }
 
 /**

diff --git a/email/url.c b/email/url.c
index e7b35bf2913412067944cba3711c03c20696eb1a..4abc4e1d6411dabb10de753fc26b7b74ab70ea71 100644 (file)
--- a/email/url.c
+++ b/email/url.c
@@ -146,8 +146,8 @@ enum UrlScheme url_check_scheme(const char *s)
   i = mutt_map_get_value(sbuf, UrlMap);
   if (i == -1)
     return U_UNKNOWN;
-  else
-    return (enum UrlScheme) i;
+
+  return (enum UrlScheme) i;
 }
 
 /**

diff --git a/handler.c b/handler.c
index 7f03eb382f7326c9f8fdc3e1624711c49654bef5..af01a980521860cd4b5cc0d6e49366beb1e4a9a8 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -1754,11 +1754,11 @@ bool mutt_can_decode(struct Body *a)
 {
   if (is_autoview(a))
     return true;
-  else if (a->type == TYPE_TEXT)
+  if (a->type == TYPE_TEXT)
     return true;
-  else if (a->type == TYPE_MESSAGE)
+  if (a->type == TYPE_MESSAGE)
     return true;
-  else if (a->type == TYPE_MULTIPART)
+  if (a->type == TYPE_MULTIPART)
   {
     if (WithCrypto)
     {

diff --git a/hcache/tc.c b/hcache/tc.c
index 8dd6267eb521390043f6452ff234389a8b422cd6..413799191e44c50726db222c42e5a15ded509af9 100644 (file)
--- a/hcache/tc.c
+++ b/hcache/tc.c
@@ -49,14 +49,12 @@ static void *hcache_tokyocabinet_open(const char *path)
     tcbdbtune(db, 0, 0, 0, -1, -1, BDBTDEFLATE);
   if (tcbdbopen(db, path, BDBOWRITER | BDBOCREAT))
     return db;
-  else
-  {
-    int ecode = tcbdbecode(db);
-    mutt_debug(LL_DEBUG2, "tcbdbopen failed for %s: %s (ecode %d)\n", path,
-               tcbdberrmsg(ecode), ecode);
-    tcbdbdel(db);
-    return NULL;
-  }
+
+  int ecode = tcbdbecode(db);
+  mutt_debug(LL_DEBUG2, "tcbdbopen failed for %s: %s (ecode %d)\n", path,
+             tcbdberrmsg(ecode), ecode);
+  tcbdbdel(db);
+  return NULL;
 }
 
 /**

diff --git a/imap/command.c b/imap/command.c
index 221499dc11e84004f86cedcad11a6a3f82002d3a..2a431678373b134d4739027cc657ad4ea10156f2 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -1270,7 +1270,7 @@ int imap_exec(struct ImapAccountData *adata, const char *cmdstr, ImapCmdFlags fl
 
   if (rc == IMAP_RES_NO)
     return IMAP_EXEC_ERROR;
-  else if (rc != IMAP_RES_OK)
+  if (rc != IMAP_RES_OK)
   {
     if (adata->status != IMAP_FATAL)
       return IMAP_EXEC_ERROR;

diff --git a/imap/imap.c b/imap/imap.c
index b3f746eb8496dfe68c0b827806db58124f1337bb..0aac2d93ca85ac923b01507a705426157859b5fe 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -599,8 +599,7 @@ int imap_access(const char *path)
 {
   if (imap_path_status(path, false) >= 0)
     return 0;
-  else
-    return -1;
+  return -1;
 }
 
 /**

diff --git a/imap/message.c b/imap/message.c
index 2b67dd671c98f6f61586ced3ffe9c69e4a348bb7..6d926dcd0d9db7d75dfa2af7a753f7cd37d5d210 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -1892,8 +1892,7 @@ int imap_msg_open(struct Mailbox *m, struct Message *msg, int msgno)
   {
     if (imap_edata_get(e)->parsed)
       return 0;
-    else
-      goto parsemsg;
+    goto parsemsg;
   }
 
   /* This function is called in a few places after endwin()

diff --git a/index.c b/index.c
index 1ebe4b9773b5890f155a8ca94a453b67ec9be60e..04cea71626aa380ef19262d2a595e4db673f305c 100644 (file)
--- a/index.c
+++ b/index.c
@@ -350,7 +350,7 @@ static int ci_first_message(void)
     {
       if (!Context->mailbox->emails[Context->mailbox->v2r[i]]->old)
         return i;
-      else if (old == -1)
+      if (old == -1)
         old = i;
     }
   }

diff --git a/keymap.c b/keymap.c
index c2257667abe3612e9c8ee95b385ead3866bdfdbc..ad0e52f1aefd2088b4f8216222e4913998db463f 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -233,8 +233,7 @@ static int parse_fkey(char *s)
 
   if (*t != '>')
     return -1;
-  else
-    return n;
+  return n;
 }
 
 /**

diff --git a/maildir/mh.c b/maildir/mh.c
index 759524af06acd5f15bf444e78bbe80d9aba72a46..41af10c17df60013547f0d9af57b79faaf252a10 100644 (file)
--- a/maildir/mh.c
+++ b/maildir/mh.c
@@ -90,8 +90,7 @@ MhSeqFlags mhs_check(struct MhSequences *mhs, int i)
 {
   if (!mhs->flags || (i > mhs->max))
     return 0;
-  else
-    return mhs->flags[i];
+  return mhs->flags[i];
 }
 
 /**

diff --git a/maildir/shared.c b/maildir/shared.c
index 1d8a494dd3f91dd413929e4a3f8d6b5bfd1f1d8a..7e1cd73f4f06d0d1ff6d3733f9746c2099e74ec7 100644 (file)
--- a/maildir/shared.c
+++ b/maildir/shared.c
@@ -535,8 +535,7 @@ static struct Maildir *maildir_merge_lists(struct Maildir *left, struct Maildir
   {
     if (left)
       return left;
-    else
-      return right;
+    return right;
   }
 
   tail = head;

diff --git a/mutt/hash.c b/mutt/hash.c
index 6e521be02ac4d4abe77732a66f50448a2ce6949c..745997456a17a7fa733906e413feb979527f229d 100644 (file)
--- a/mutt/hash.c
+++ b/mutt/hash.c
@@ -227,8 +227,7 @@ static void *union_hash_find(const struct Hash *table, union HashKey key)
   struct HashElem *he = union_hash_find_elem(table, key);
   if (he)
     return he->data;
-  else
-    return NULL;
+  return NULL;
 }
 
 /**

diff --git a/mutt/mbyte.c b/mutt/mbyte.c
index a16bcff0336efc7b35b429a9a2244403fce8ffb0..503dab17773f264a3558fa2a03f57bc8a060bb96 100644 (file)
--- a/mutt/mbyte.c
+++ b/mutt/mbyte.c
@@ -114,7 +114,7 @@ bool mutt_mb_get_initials(const char *name, char *buf, size_t buflen)
       clen = mutt_mb_charlen(name, NULL);
       if (clen < 1)
         return false;
-      else if ((clen == 1) && (isspace(*name) || (*name == '-')))
+      if ((clen == 1) && (isspace(*name) || (*name == '-')))
         break;
     }
 

diff --git a/mutt/path.c b/mutt/path.c
index 59855066af6108f32f2131aae5a973ee30ec9c31..bebbe589afbd621a0a3f4a0bdad890607d133632 100644 (file)
--- a/mutt/path.c
+++ b/mutt/path.c
@@ -312,8 +312,7 @@ const char *mutt_path_basename(const char *f)
   const char *p = strrchr(f, '/');
   if (p)
     return p + 1;
-  else
-    return f;
+  return f;
 }
 
 /**

diff --git a/mutt/string.c b/mutt/string.c
index afbb91fc99c45b2f7c36ec8e22ed0e81aff756c8..d98c2885527b54d655ab94a659c0472b5a3c7312 100644 (file)
--- a/mutt/string.c
+++ b/mutt/string.c
@@ -976,8 +976,7 @@ int mutt_str_word_casecmp(const char *a, const char *b)
   {
     if (a)
       return 1;
-    else
-      return 0;
+    return 0;
   }
 
   char tmp[128] = { 0 };

diff --git a/mutt_account.c b/mutt_account.c
index 4cc933dfa20dac9e870eba2189f56e5e27920944..2789c1bd79de693a26e912f63923a642a84a0b7b 100644 (file)
--- a/mutt_account.c
+++ b/mutt_account.c
@@ -253,7 +253,7 @@ int mutt_account_getlogin(struct ConnAccount *account)
   if (account->flags & MUTT_ACCT_LOGIN)
     return 0;
 #ifdef USE_IMAP
-  else if (account->type == MUTT_ACCT_TYPE_IMAP)
+  if (account->type == MUTT_ACCT_TYPE_IMAP)
   {
     if (C_ImapLogin)
     {

diff --git a/mutt_thread.c b/mutt_thread.c
index a6e43d20023af5f9744d84a196e77461cb04e127..1ab4ee3520103e6ae1dc920e11ab1d5c05def5aa 100644 (file)
--- a/mutt_thread.c
+++ b/mutt_thread.c
@@ -95,8 +95,7 @@ static bool need_display_subject(struct Context *ctx, struct Email *e)
     {
       if (e->subject_changed)
         return true;
-      else
-        break;
+      break;
     }
   }
 
@@ -109,7 +108,7 @@ static bool need_display_subject(struct Context *ctx, struct Email *e)
     {
       if (is_visible(e, ctx))
         return false;
-      else if (e->subject_changed)
+      if (e->subject_changed)
         return true;
     }
   }
@@ -1279,13 +1278,13 @@ int mutt_traverse_thread(struct Context *ctx, struct Email *e_cur, MuttThreadFla
     /* return value depends on action requested */
     if (flag & (MUTT_THREAD_COLLAPSE | MUTT_THREAD_UNCOLLAPSE))
       return final;
-    else if (flag & MUTT_THREAD_UNREAD)
+    if (flag & MUTT_THREAD_UNREAD)
       return (old_mail && new_mail) ? new_mail : (old_mail ? old_mail : new_mail);
-    else if (flag & MUTT_THREAD_GET_HIDDEN)
+    if (flag & MUTT_THREAD_GET_HIDDEN)
       return num_hidden;
-    else if (flag & MUTT_THREAD_NEXT_UNREAD)
+    if (flag & MUTT_THREAD_NEXT_UNREAD)
       return min_unread;
-    else if (flag & MUTT_THREAD_FLAGGED)
+    if (flag & MUTT_THREAD_FLAGGED)
       return flagged;
   }
 
@@ -1369,13 +1368,13 @@ int mutt_traverse_thread(struct Context *ctx, struct Email *e_cur, MuttThreadFla
   /* return value depends on action requested */
   if (flag & (MUTT_THREAD_COLLAPSE | MUTT_THREAD_UNCOLLAPSE))
     return final;
-  else if (flag & MUTT_THREAD_UNREAD)
+  if (flag & MUTT_THREAD_UNREAD)
     return (old_mail && new_mail) ? new_mail : (old_mail ? old_mail : new_mail);
-  else if (flag & MUTT_THREAD_GET_HIDDEN)
+  if (flag & MUTT_THREAD_GET_HIDDEN)
     return num_hidden + 1;
-  else if (flag & MUTT_THREAD_NEXT_UNREAD)
+  if (flag & MUTT_THREAD_NEXT_UNREAD)
     return min_unread;
-  else if (flag & MUTT_THREAD_FLAGGED)
+  if (flag & MUTT_THREAD_FLAGGED)
     return flagged;
 
   return 0;

diff --git a/mutt_window.c b/mutt_window.c
index b320beae189fabd0f8a2e5f746b3b256271a5245..f898748bfed82161a0feace55ae8f4ea613e64d9 100644 (file)
--- a/mutt_window.c
+++ b/mutt_window.c
@@ -352,10 +352,9 @@ int mutt_window_wrap_cols(int width, short wrap)
 {
   if (wrap < 0)
     return (width > -wrap) ? (width + wrap) : width;
-  else if (wrap)
+  if (wrap)
     return (wrap < width) ? wrap : width;
-  else
-    return width;
+  return width;
 }
 
 /**

diff --git a/mx.c b/mx.c
index 74e8776016cb14a142c984d35accfc196bfc8907..fb45eef577107afaef648fa228dbacb185281ddc 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -588,7 +588,7 @@ int mx_mbox_close(struct Context **ptr)
           query_quadoption(C_CatchupNewsgroup, _("Mark all articles read?"));
       if (ans == MUTT_ABORT)
         goto cleanup;
-      else if (ans == MUTT_YES)
+      if (ans == MUTT_YES)
         mutt_newsgroup_catchup(m, mdata->adata, mdata->group);
     }
   }
@@ -873,7 +873,7 @@ int mx_mbox_sync(struct Mailbox *m, int *index_hint)
     purge = query_quadoption(C_Delete, buf);
     if (purge == MUTT_ABORT)
       return -1;
-    else if (purge == MUTT_NO)
+    if (purge == MUTT_NO)
     {
       if (!m->changed)
         return 0; /* nothing to do! */
@@ -1170,10 +1170,9 @@ int mx_check_empty(const char *path)
       int rc = imap_path_status(path, false);
       if (rc < 0)
         return -1;
-      else if (rc == 0)
+      if (rc == 0)
         return 1;
-      else
-        return 0;
+      return 0;
     }
 #endif
     default:

diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index cf412853e437614f29984c45dd5ce20b8f95856b..c02e309cb0aa365026816d271cc694eca6c4f39c 100644 (file)
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -635,10 +635,9 @@ SecurityFlags mutt_is_application_smime(struct Body *m)
     {
       if (mutt_str_strcasecmp(t, "enveloped-data") == 0)
         return SMIME_ENCRYPT;
-      else if (mutt_str_strcasecmp(t, "signed-data") == 0)
+      if (mutt_str_strcasecmp(t, "signed-data") == 0)
         return SMIME_SIGN | SMIME_OPAQUE;
-      else
-        return SEC_NO_FLAGS;
+      return SEC_NO_FLAGS;
     }
     /* Netscape 4.7 uses
      * Content-Description: S/MIME Encrypted Message

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 7346ec8af469d0b3ded4fdb7e1a1148ff2dded94..b6abb8a7d9456bda340cb13de8d9214502b4debd 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -443,24 +443,22 @@ static int cmp_version_strings(const char *a, const char *b, int level)
       r = strcmp(a_plvl, b_plvl);
       if (!r)
         return 0;
-      else if (r > 0)
+      if (r > 0)
         return positive;
-      else
-        return negative;
+      return negative;
     }
-    else if (*a_plvl == '.')
+    if (*a_plvl == '.')
       return negative; /* B is larger. */
-    else if (*b_plvl == '.')
+    if (*b_plvl == '.')
       return positive; /* A is larger. */
-    else if (*a_plvl != *b_plvl)
+    if (*a_plvl != *b_plvl)
       break;
   }
   if (*a_plvl == *b_plvl)
     return 0;
-  else if ((*(signed char *) a_plvl - *(signed char *) b_plvl) > 0)
+  if ((*(signed char *) a_plvl - *(signed char *) b_plvl) > 0)
     return positive;
-  else
-    return negative;
+  return negative;
 }
 #endif                                 /* gpgme >= 1.9.0 */
 
@@ -604,14 +602,14 @@ static char crypt_flags(KeyFlags flags)
 {
   if (flags & KEYFLAG_REVOKED)
     return 'R';
-  else if (flags & KEYFLAG_EXPIRED)
+  if (flags & KEYFLAG_EXPIRED)
     return 'X';
-  else if (flags & KEYFLAG_DISABLED)
+  if (flags & KEYFLAG_DISABLED)
     return 'd';
-  else if (flags & KEYFLAG_CRITICAL)
+  if (flags & KEYFLAG_CRITICAL)
     return 'c';
-  else
-    return ' ';
+
+  return ' ';
 }
 
 /**
@@ -3624,8 +3622,7 @@ static int compare_key_address(const void *a, const void *b)
   r = mutt_str_strcasecmp((*s)->uid, (*t)->uid);
   if (r != 0)
     return r > 0;
-  else
-    return mutt_str_strcasecmp(crypt_fpr_or_lkeyid(*s), crypt_fpr_or_lkeyid(*t)) > 0;
+  return mutt_str_strcasecmp(crypt_fpr_or_lkeyid(*s), crypt_fpr_or_lkeyid(*t)) > 0;
 }
 
 /**
@@ -3659,8 +3656,7 @@ static int compare_keyid(const void *a, const void *b)
   r = mutt_str_strcasecmp(crypt_fpr_or_lkeyid(*s), crypt_fpr_or_lkeyid(*t));
   if (r != 0)
     return r > 0;
-  else
-    return mutt_str_strcasecmp((*s)->uid, (*t)->uid) > 0;
+  return mutt_str_strcasecmp((*s)->uid, (*t)->uid) > 0;
 }
 
 /**

diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index a6e43bcff3a64950a839e02ed5feb4f97b217c65..dcf9f1df704715229d2ffb6f931f00dc061ba313 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -189,8 +189,7 @@ char *pgp_this_keyid(struct PgpKeyInfo *k)
 {
   if (C_PgpLongIds)
     return k->keyid;
-  else
-    return k->keyid + 8;
+  return k->keyid + 8;
 }
 
 /**

diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index 70e8b2102163c225b1902820076147e8344b07f1..7452029022a0d17f290410f5f88e50576fb2dc9a 100644 (file)
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -142,14 +142,14 @@ static char pgp_flags(KeyFlags flags)
 {
   if (flags & KEYFLAG_REVOKED)
     return 'R';
-  else if (flags & KEYFLAG_EXPIRED)
+  if (flags & KEYFLAG_EXPIRED)
     return 'X';
-  else if (flags & KEYFLAG_DISABLED)
+  if (flags & KEYFLAG_DISABLED)
     return 'd';
-  else if (flags & KEYFLAG_CRITICAL)
+  if (flags & KEYFLAG_CRITICAL)
     return 'c';
-  else
-    return ' ';
+
+  return ' ';
 }
 
 /**
@@ -161,8 +161,7 @@ static struct PgpKeyInfo *pgp_principal_key(struct PgpKeyInfo *key)
 {
   if (key->flags & KEYFLAG_SUBKEY && key->parent)
     return key->parent;
-  else
-    return key;
+  return key;
 }
 
 /**
@@ -369,12 +368,10 @@ static int compare_key_address(const void *a, const void *b)
 
   r = mutt_str_strcasecmp((*s)->addr, (*t)->addr);
   if (r != 0)
-    return r > 0;
-  else
-  {
-    return mutt_str_strcasecmp(pgp_fpr_or_lkeyid((*s)->parent),
-                               pgp_fpr_or_lkeyid((*t)->parent)) > 0;
-  }
+    return (r > 0);
+
+  return mutt_str_strcasecmp(pgp_fpr_or_lkeyid((*s)->parent),
+                             pgp_fpr_or_lkeyid((*t)->parent)) > 0;
 }
 
 /**
@@ -408,9 +405,8 @@ static int compare_keyid(const void *a, const void *b)
 
   r = mutt_str_strcasecmp(pgp_fpr_or_lkeyid((*s)->parent), pgp_fpr_or_lkeyid((*t)->parent));
   if (r != 0)
-    return r > 0;
-  else
-    return mutt_str_strcasecmp((*s)->addr, (*t)->addr) > 0;
+    return (r > 0);
+  return mutt_str_strcasecmp((*s)->addr, (*t)->addr) > 0;
 }
 
 /**

diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index f23d3e98dd2c1ddebd5037b7c00edfae7c4fd61d..850e930f91990e6819aa4cbb920af63e40295ef7 100644 (file)
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -118,7 +118,7 @@ static enum NmQueryType string_to_query_type(const char *str)
 {
   if (mutt_str_strcmp(str, "threads") == 0)
     return NM_QUERY_TYPE_THREADS;
-  else if (mutt_str_strcmp(str, "messages") == 0)
+  if (mutt_str_strcmp(str, "messages") == 0)
     return NM_QUERY_TYPE_MESGS;
 
   mutt_error(_("failed to parse notmuch query type: %s"), NONULL(str));
@@ -349,8 +349,7 @@ static const char *query_type_to_string(enum NmQueryType query_type)
 {
   if (query_type == NM_QUERY_TYPE_THREADS)
     return "threads";
-  else
-    return "messages";
+  return "messages";
 }
 
 /**

diff --git a/pattern.c b/pattern.c
index d9527f7a2bf3f34d98bc6ff380fe580e838edbbc..b8552d1857b17905fd831ae0f1e16419d0e35091 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -888,7 +888,7 @@ static int scan_range_slot(struct Buffer *s, regmatch_t pmatch[], int grp, int s
   {
     if (side == RANGE_S_LEFT)
       return 1;
-    else if (side == RANGE_S_RIGHT)
+    if (side == RANGE_S_RIGHT)
       return Context->mailbox->msg_count;
   }
   /* We have something, so determine what */
@@ -1071,12 +1071,11 @@ static bool patmatch(const struct Pattern *pat, const char *buf)
 {
   if (pat->is_multi)
     return (mutt_list_find(&pat->p.multi_cases, buf) != NULL);
-  else if (pat->string_match)
+  if (pat->string_match)
     return pat->ign_case ? strcasestr(buf, pat->p.str) : strstr(buf, pat->p.str);
-  else if (pat->group_match)
+  if (pat->group_match)
     return mutt_group_match(pat->p.group, buf);
-  else
-    return (regexec(pat->p.regex, buf, 0, NULL, 0) == 0);
+  return (regexec(pat->p.regex, buf, 0, NULL, 0) == 0);
 }
 
 /**

diff --git a/recvcmd.c b/recvcmd.c
index 381febe3c909b8ec75159adc04ce2581e38d1b0a..102e0795fc1362e1edca44e92c8c2587fa096f36 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -93,7 +93,7 @@ static bool check_all_msg(struct AttachCtx *actx, struct Body *cur, bool err)
 {
   if (cur && !check_msg(cur, err))
     return false;
-  else if (!cur)
+  if (!cur)
   {
     for (short i = 0; i < actx->idxlen; i++)
     {
@@ -945,7 +945,7 @@ void mutt_attach_reply(FILE *fp, struct Email *e, struct AttachCtx *actx,
                              "MIME-encapsulate the others?"));
     if (ans == MUTT_ABORT)
       return;
-    else if (ans == MUTT_YES)
+    if (ans == MUTT_YES)
       mime_reply_any = true;
   }
   else if (nattach == 1)

diff --git a/send.c b/send.c
index b2abd6de3d4b03a72c49ff34a460519dd4122016..dcae92b456d76ad6c131739dd63f475739e64e1b 100644 (file)
--- a/send.c
+++ b/send.c
@@ -299,8 +299,7 @@ static int edit_envelope(struct Envelope *en, SendFlags flags)
   {
     if (C_FastReply)
       return 0;
-    else
-      mutt_str_strfcpy(buf, en->subject, sizeof(buf));
+    mutt_str_strfcpy(buf, en->subject, sizeof(buf));
   }
   else
   {

diff --git a/sendlib.c b/sendlib.c
index b13d3691a7a6c8d9282e636b22ff2d2593429768..9df5a5cd3ccede83634dc807dd1b1825b11ea6e3 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -1698,7 +1698,7 @@ static int get_toplevel_encoding(struct Body *a)
   {
     if (a->encoding == ENC_BINARY)
       return ENC_BINARY;
-    else if (a->encoding == ENC_8BIT)
+    if (a->encoding == ENC_8BIT)
       e = ENC_8BIT;
   }
 

diff --git a/sort.c b/sort.c
index ca5fd94a66560964aaa29d06875904224f19a9ac..993d1875a9e4bf43307dd2a5a58447588b5c0d3b 100644 (file)
--- a/sort.c
+++ b/sort.c
@@ -160,9 +160,9 @@ const char *mutt_get_name(const struct Address *a)
   {
     if (C_ReverseAlias && (ali = mutt_alias_reverse_lookup(a)) && ali->personal)
       return ali->personal;
-    else if (a->personal)
+    if (a->personal)
       return a->personal;
-    else if (a->mailbox)
+    if (a->mailbox)
       return mutt_addr_for_display(a);
   }
   /* don't return NULL to avoid segfault when printing/comparing */