clang-format

diff --git a/browser.c b/browser.c
index 64d3a1b5e7bd8f826243f85023d272880c43774e..38418f7b87b9ba67eb7f9c36f42a80dce04e3a28 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -1390,7 +1390,7 @@ void mutt_select_file(char *f, size_t flen, int flags, char ***files, int *numfi
 #ifdef USE_NNTP
                                  OptNews ? FolderNewsHelp :
 #endif
-                                            FolderHelp);
+                                           FolderHelp);
   mutt_menu_push_current(menu);
 
   init_menu(&state, menu, title, sizeof(title), buffy);

diff --git a/buffy.c b/buffy.c
index 027574e859a6cf3f17e9cd8168a1f83ea6e08d4f..a58352425d1da0659554058acae8664428a42452 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -353,7 +353,7 @@ static void buffy_check(struct Buffy *tmp, struct stat *contex_sb, bool check_st
   int orig_count, orig_unread, orig_flagged;
 #endif
 
-  memset(&sb, 0, sizeof (sb));
+  memset(&sb, 0, sizeof(sb));
 
 #ifdef USE_SIDEBAR
   orig_new = tmp->new;

diff --git a/conn/ssl.c b/conn/ssl.c
index cb6a4f8941f59dc56c7d4562e311dd3d56ec5349..ff59dbe58fc2a0cdb101ccb584682b68a8507c75 100644 (file)
--- a/conn/ssl.c
+++ b/conn/ssl.c
@@ -1318,7 +1318,7 @@ static int ssl_setup(struct Connection *conn)
     goto free_sasldata;
   }
 
-    /* disable SSL protocols as needed */
+  /* disable SSL protocols as needed */
 #ifdef SSL_OP_NO_TLSv1_2
   if (!SslUseTlsv12)
     SSL_CTX_set_options(ssldata->ctx, SSL_OP_NO_TLSv1_2);

diff --git a/curs_main.c b/curs_main.c
index c483f0a3b50ab89ea85a095919a36953e69045ac..3012c18bd469faecc576ae4680901cae4bfd3df0 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -127,7 +127,7 @@ static const char *NoVisible = N_("No visible messages.");
   }
 
 #define CHECK_ATTACH                                                           \
-  if (OptAttachMsg)                                                          \
+  if (OptAttachMsg)                                                            \
   {                                                                            \
     mutt_flushinp();                                                           \
     mutt_error(_(Function_not_permitted_in_attach_message_mode));              \

diff --git a/enter.c b/enter.c
index 46fc6939d18b03506908435a15083c47c7a7b07f..7939c8f8e82e8fca264050b07862935663e96ee6 100644 (file)
--- a/enter.c
+++ b/enter.c
@@ -784,4 +784,3 @@ void mutt_enter_state_free(struct EnterState **esp)
   FREE(&(*esp)->wbuf);
   FREE(esp);
 }
-

diff --git a/handler.c b/handler.c
index cef5784b1388f7fe3b125967a00c60c1ea8d8e8b..80aeae3795b3fd8cddb8c2cce82d3140c5cf5d94 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -396,7 +396,7 @@ static void decode_uuencoded(struct State *s, long len, int istext, iconv_t cd)
   state_reset_prefix(s);
 }
 
-  /* ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
    * A (not so) minimal implementation of RFC1563.
    */
 

diff --git a/init.c b/init.c
index a24298670280853be73e69821c9d70d43e70de9d..b8a0e7c53f3870df3c480098239a7b15f331643a 100644 (file)
--- a/init.c
+++ b/init.c
@@ -2564,8 +2564,7 @@ static int parse_set(struct Buffer *buf, struct Buffer *s, unsigned long data,
         break;
       }
 
-      if (OptAttachMsg &&
-          (mutt_str_strcmp(MuttVars[idx].name, "reply_regex") == 0))
+      if (OptAttachMsg && (mutt_str_strcmp(MuttVars[idx].name, "reply_regex") == 0))
       {
         snprintf(err->data, err->dsize, "Operation not permitted when in attach-message mode.");
         r = -1;
@@ -2827,7 +2826,8 @@ static int parse_set(struct Buffer *buf, struct Buffer *s, unsigned long data,
 #endif
     else
     {
-      snprintf(err->data, err->dsize, _("%s: unknown type"), (idx >= 0) ? MuttVars[idx].name : "unknown");
+      snprintf(err->data, err->dsize, _("%s: unknown type"),
+               (idx >= 0) ? MuttVars[idx].name : "unknown");
       r = -1;
       break;
     }
@@ -3824,7 +3824,8 @@ static bool get_hostname(void)
     /* now get FQDN.  Use configured domain first, DNS next, then uname */
 #ifdef DOMAIN
     /* we have a compile-time domain name, use that for Hostname */
-    Hostname = mutt_mem_malloc(mutt_str_strlen(DOMAIN) + mutt_str_strlen(ShortHostname) + 2);
+    Hostname =
+        mutt_mem_malloc(mutt_str_strlen(DOMAIN) + mutt_str_strlen(ShortHostname) + 2);
     sprintf((char *) Hostname, "%s.%s", NONULL(ShortHostname), DOMAIN);
 #else
     Hostname = getmailname();
@@ -3833,7 +3834,8 @@ static bool get_hostname(void)
       char buffer[LONG_STRING];
       if (getdnsdomainname(buffer, sizeof(buffer)) == 0)
       {
-        Hostname = mutt_mem_malloc(mutt_str_strlen(buffer) + mutt_str_strlen(ShortHostname) + 2);
+        Hostname = mutt_mem_malloc(mutt_str_strlen(buffer) +
+                                   mutt_str_strlen(ShortHostname) + 2);
         sprintf((char *) Hostname, "%s.%s", NONULL(ShortHostname), buffer);
       }
       else

diff --git a/keymap.c b/keymap.c
index 663a5485fe37d4add0ef5a03aa67c66a82e5bf2f..5f545a0225fc76a49e3964070b224ea099daa37e 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -1284,4 +1284,3 @@ void mutt_free_keys(void)
     Keymaps[i] = NULL;
   }
 }
-

diff --git a/main.c b/main.c
index 90e8045134c8802d2e24a48105a58b49c5a656a1..aea16f5ad60053c74266c2a2a99cbcd32f8734c4 100644 (file)
--- a/main.c
+++ b/main.c
@@ -598,7 +598,8 @@ int main(int argc, char *argv[], char *envp[])
   if (!NewsServer)
   {
     char buffer[1024];
-    char *server = mutt_file_read_keyword(SYSCONFDIR "/nntpserver", buffer, sizeof(buffer));
+    char *server =
+        mutt_file_read_keyword(SYSCONFDIR "/nntpserver", buffer, sizeof(buffer));
     NewsServer = mutt_str_strdup(server);
   }
   if (NewsServer)

diff --git a/mutt/charset.c b/mutt/charset.c
index 32994775a05ca5143da85cb0063cd8658c205dd8..b70302bbbec3c840d220e74b19059f8884b44c26 100644 (file)
--- a/mutt/charset.c
+++ b/mutt/charset.c
@@ -366,7 +366,7 @@ out:
  * @param cs1 First character set
  * @param cs2 Second character set
  * @retval 1 Names are equivalent
- * @retval 0 Names differ 
+ * @retval 0 Names differ
  *
  * Charsets may have extensions that mutt_ch_canonical_charset() leaves intact;
  * we expect 'cs2' to originate from neomutt code, not user input (i.e. 'cs2'
@@ -578,9 +578,9 @@ iconv_t mutt_ch_iconv_open(const char *tocode, const char *fromcode, int flags)
  * If you're supplying inrepls, the source charset should be stateless;
  * if you're supplying an outrepl, the target charset should be.
  */
-size_t mutt_ch_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf,
-                     size_t *outbytesleft, const char **inrepls, const char *outrepl,
-                     int *iconverrno)
+size_t mutt_ch_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft,
+                     char **outbuf, size_t *outbytesleft, const char **inrepls,
+                     const char *outrepl, int *iconverrno)
 {
   size_t rc = 0;
   const char *ib = *inbuf;
@@ -865,7 +865,8 @@ int mutt_ch_fgetconv(struct FgetConv *fc)
   if (fc->ibl)
   {
     size_t obl = sizeof(fc->bufo);
-    mutt_ch_iconv(fc->cd, (const char **) &fc->ib, &fc->ibl, &fc->ob, &obl, fc->inrepls, 0, NULL);
+    mutt_ch_iconv(fc->cd, (const char **) &fc->ib, &fc->ibl, &fc->ob, &obl,
+                  fc->inrepls, 0, NULL);
     if (fc->p < fc->ob)
       return (unsigned char) *(fc->p)++;
   }

diff --git a/mutt/file.c b/mutt/file.c
index 5e5926154d43a3a8dbdc59f885b72afd438eabdb..1cf3f91e76c30fe7f4dd8cc9f85a1c19ab66cf94 100644 (file)
--- a/mutt/file.c
+++ b/mutt/file.c
@@ -1388,4 +1388,3 @@ int mutt_file_check_empty(const char *path)
 
   return ((st.st_size == 0));
 }
-

diff --git a/mutt/rfc2047.c b/mutt/rfc2047.c
index 18ec1e4be23d83541a56a84a62016074ecc1901c..6a6893c380b6754347a79382862713c5c3d34117 100644 (file)
--- a/mutt/rfc2047.c
+++ b/mutt/rfc2047.c
@@ -153,7 +153,7 @@ static char *parse_encoded_word(char *str, enum ContentEncoding *enc, char **cha
                             "\\?"
                             "([qQbB])" /* encoding */
                             "\\?"
-                            "([^?]+)" /* encoded text - we accept whitespace 
+                            "([^?]+)" /* encoded text - we accept whitespace
                                          as some mailers do that, see #1189. */
                             "\\?=",
                             REG_EXTENDED);

diff --git a/mutt_socket.c b/mutt_socket.c
index ac2c5d1cafd99972bdf2bb401c3bdf38d690086e..bf62750a415c38187b44b9ec83a182619ee7891d 100644 (file)
--- a/mutt_socket.c
+++ b/mutt_socket.c
@@ -60,7 +60,8 @@ struct Connection *mutt_conn_find(const struct Connection *start, const struct A
   url_tostring(&url, hook, sizeof(hook), 0);
   mutt_account_hook(hook);
 
-  struct Connection *conn = start ? TAILQ_NEXT(start, entries) : TAILQ_FIRST(mutt_socket_head());
+  struct Connection *conn =
+      start ? TAILQ_NEXT(start, entries) : TAILQ_FIRST(mutt_socket_head());
   while (conn)
   {
     if (mutt_account_match(account, &(conn->account)))

diff --git a/mutt_window.c b/mutt_window.c
index 1106963ea5c66bb13b26cd9b3f8cdfa61b274224..e188c4266e9df692f30dfc3bc54ac07afc744ced 100644 (file)
--- a/mutt_window.c
+++ b/mutt_window.c
@@ -27,14 +27,14 @@
  */
 
 #include "config.h"
-#include "globals.h"
+#include <stdarg.h>
+#include <string.h>
 #include "mutt/logging.h"
 #include "mutt/mutt.h"
-#include "mutt_menu.h"
 #include "mutt_window.h"
+#include "globals.h"
+#include "mutt_menu.h"
 #include "options.h"
-#include <stdarg.h>
-#include <string.h>
 
 struct MuttWindow *MuttHelpWindow = NULL;    /**< Help Window */
 struct MuttWindow *MuttIndexWindow = NULL;   /**< Index Window */

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 7bac1c282c6794c5b6476163f080e673a07c1e7a..3a93199ace870c4e5ea0602211bc88407d9ebf2f 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -4129,7 +4129,8 @@ static void crypt_add_string_to_hints(const char *str, struct ListHead *hints)
   if (!scratch)
     return;
 
-  for (char *t = strtok(scratch, " ,.:\"()<>\n"); t; t = strtok(NULL, " ,.:\"()<>\n"))
+  for (char *t = strtok(scratch, " ,.:\"()<>\n"); t;
+       t = strtok(NULL, " ,.:\"()<>\n"))
   {
     if (strlen(t) > 3)
       mutt_list_insert_tail(hints, mutt_str_strdup(t));
@@ -4280,30 +4281,34 @@ static struct CryptKeyInfo *crypt_select_key(struct CryptKeyInfo *keys,
         }
 
         if (OptPgpCheckTrust && (!crypt_id_is_valid(key_table[menu->current]) ||
-                                    !crypt_id_is_strong(key_table[menu->current])))
+                                 !crypt_id_is_strong(key_table[menu->current])))
         {
           const char *warn_s = NULL;
           char buf2[LONG_STRING];
 
           if (key_table[menu->current]->flags & KEYFLAG_CANTUSE)
-            warn_s = _("ID is expired/disabled/revoked. Do you really want to use the key?");
+            warn_s = _("ID is expired/disabled/revoked. Do you really want to "
+                       "use the key?");
           else
           {
             warn_s = "??";
             switch (key_table[menu->current]->validity)
             {
               case GPGME_VALIDITY_NEVER:
-                warn_s = _("ID is not valid. Do you really want to use the key?");
+                warn_s =
+                    _("ID is not valid. Do you really want to use the key?");
                 break;
               case GPGME_VALIDITY_MARGINAL:
-                warn_s = _("ID is only marginally valid. Do you really want to use the key?");
+                warn_s = _("ID is only marginally valid. Do you really want to "
+                           "use the key?");
                 break;
               case GPGME_VALIDITY_FULL:
               case GPGME_VALIDITY_ULTIMATE:
                 break;
               case GPGME_VALIDITY_UNKNOWN:
               case GPGME_VALIDITY_UNDEFINED:
-                warn_s = _("ID has undefined validity. Do you really want to use the key?");
+                warn_s = _("ID has undefined validity. Do you really want to "
+                           "use the key?");
                 break;
             }
           }
@@ -4747,7 +4752,8 @@ struct Body *pgp_gpgme_make_key_attachment(char *tempf)
 
   OptPgpCheckTrust = false;
 
-  struct CryptKeyInfo *key = crypt_ask_for_key(_("Please enter the key ID: "), NULL, 0, APPLICATION_PGP, NULL);
+  struct CryptKeyInfo *key = crypt_ask_for_key(_("Please enter the key ID: "),
+                                               NULL, 0, APPLICATION_PGP, NULL);
   if (!key)
     goto bail;
   export_keys[0] = key->kobj;

diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index bd96f303ddb7f0355bd3c18cf8ce5e8af6072353..abb00c40de83526d8b92bc18fe1a1a046f6d0add 100644 (file)
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -631,24 +631,27 @@ static struct PgpKeyInfo *pgp_select_key(struct PgpKeyInfo *keys,
         }
 
         if (OptPgpCheckTrust && (!pgp_id_is_valid(KeyTable[menu->current]) ||
-                                    !pgp_id_is_strong(KeyTable[menu->current])))
+                                 !pgp_id_is_strong(KeyTable[menu->current])))
         {
           char *str = "";
           char buf2[LONG_STRING];
 
           if (KeyTable[menu->current]->flags & KEYFLAG_CANTUSE)
-            str = _("ID is expired/disabled/revoked. Do you really want to use the key?");
+            str = _("ID is expired/disabled/revoked. Do you really want to use "
+                    "the key?");
           else
             switch (KeyTable[menu->current]->trust & 0x03)
             {
               case 0:
-                str = _("ID has undefined validity. Do you really want to use the key?");
+                str = _("ID has undefined validity. Do you really want to use "
+                        "the key?");
                 break;
               case 1:
                 str = _("ID is not valid. Do you really want to use the key?");
                 break;
               case 2:
-                str = _("ID is only marginally valid. Do you really want to use the key?");
+                str = _("ID is only marginally valid. Do you really want to "
+                        "use the key?");
                 break;
             }
 
@@ -744,7 +747,8 @@ struct Body *pgp_make_key_attachment(char *tempf)
   pid_t thepid;
   OptPgpCheckTrust = false;
 
-  struct PgpKeyInfo *key = pgp_ask_for_key(_("Please enter the key ID: "), NULL, 0, PGP_PUBRING);
+  struct PgpKeyInfo *key =
+      pgp_ask_for_key(_("Please enter the key ID: "), NULL, 0, PGP_PUBRING);
 
   if (!key)
     return NULL;
@@ -822,7 +826,8 @@ static void pgp_add_string_to_hints(const char *str, struct ListHead *hints)
   if (!scratch)
     return;
 
-  for (char *t = strtok(scratch, " ,.:\"()<>\n"); t; t = strtok(NULL, " ,.:\"()<>\n"))
+  for (char *t = strtok(scratch, " ,.:\"()<>\n"); t;
+       t = strtok(NULL, " ,.:\"()<>\n"))
   {
     if (strlen(t) > 3)
       mutt_list_insert_tail(hints, mutt_str_strdup(t));

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 0df2137bfed1f1ac9b8d8be09fdc94febd5a9964..3f1e77aae6bab600f4b592c3de2c2ab085249610 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -371,7 +371,7 @@ static void smime_entry(char *buf, size_t buflen, struct Menu *menu, int num)
       /* L10N: Describes the trust state of a S/MIME key.
          This translation must be padded with spaces to the right such that it
          has the same length as the other translations.
-        
+
          The translation strings which need to be padded are:
          Expired, Invalid, Revoked, Trusted, Unverified, Verified, and Unknown.
        */
@@ -381,7 +381,7 @@ static void smime_entry(char *buf, size_t buflen, struct Menu *menu, int num)
       /* L10N: Describes the trust state of a S/MIME key.
          This translation must be padded with spaces to the right such that it
          has the same length as the other translations.
-        
+
          The translation strings which need to be padded are:
          Expired, Invalid, Revoked, Trusted, Unverified, Verified, and Unknown.
        */
@@ -391,7 +391,7 @@ static void smime_entry(char *buf, size_t buflen, struct Menu *menu, int num)
       /* L10N: Describes the trust state of a S/MIME key.
          This translation must be padded with spaces to the right such that it
          has the same length as the other translations.
-        
+
          The translation strings which need to be padded are:
          Expired, Invalid, Revoked, Trusted, Unverified, Verified, and Unknown.
        */
@@ -401,7 +401,7 @@ static void smime_entry(char *buf, size_t buflen, struct Menu *menu, int num)
       /* L10N: Describes the trust state of a S/MIME key.
          This translation must be padded with spaces to the right such that it
          has the same length as the other translations.
-        
+
          The translation strings which need to be padded are:
          Expired, Invalid, Revoked, Trusted, Unverified, Verified, and Unknown.
        */
@@ -411,7 +411,7 @@ static void smime_entry(char *buf, size_t buflen, struct Menu *menu, int num)
       /* L10N: Describes the trust state of a S/MIME key.
          This translation must be padded with spaces to the right such that it
          has the same length as the other translations.
-        
+
          The translation strings which need to be padded are:
          Expired, Invalid, Revoked, Trusted, Unverified, Verified, and Unknown.
        */
@@ -421,7 +421,7 @@ static void smime_entry(char *buf, size_t buflen, struct Menu *menu, int num)
       /* L10N: Describes the trust state of a S/MIME key.
          This translation must be padded with spaces to the right such that it
          has the same length as the other translations.
-        
+
          The translation strings which need to be padded are:
          Expired, Invalid, Revoked, Trusted, Unverified, Verified, and Unknown.
        */
@@ -431,7 +431,7 @@ static void smime_entry(char *buf, size_t buflen, struct Menu *menu, int num)
       /* L10N: Describes the trust state of a S/MIME key.
          This translation must be padded with spaces to the right such that it
          has the same length as the other translations.
-        
+
          The translation strings which need to be padded are:
          Expired, Invalid, Revoked, Trusted, Unverified, Verified, and Unknown.
        */
@@ -502,10 +502,12 @@ static struct SmimeKey *smime_select_key(struct SmimeKey *keys, char *query)
             case 'e':
             case 'i':
             case 'r':
-              s = _("ID is expired/disabled/revoked. Do you really want to use the key?");
+              s = _("ID is expired/disabled/revoked. Do you really want to use "
+                    "the key?");
               break;
             case 'u':
-              s = _("ID has undefined validity. Do you really want to use the key?");
+              s = _("ID has undefined validity. Do you really want to use the "
+                    "key?");
               break;
             case 'v':
               s = _("ID is not trusted. Do you really want to use the key?");
@@ -1262,8 +1264,9 @@ void smime_invoke_import(char *infile, char *mailbox)
   {
     mutt_endwin();
 
-    pid_t thepid = smime_invoke(&smimein, NULL, NULL, -1, fileno(fpout), fileno(fperr), certfile,
-                          NULL, NULL, NULL, NULL, NULL, NULL, SmimeImportCertCommand);
+    pid_t thepid = smime_invoke(&smimein, NULL, NULL, -1, fileno(fpout),
+                                fileno(fperr), certfile, NULL, NULL, NULL, NULL,
+                                NULL, NULL, SmimeImportCertCommand);
     if (thepid == -1)
     {
       mutt_message(_("Error: unable to create OpenSSL subprocess!"));

diff --git a/pager.c b/pager.c
index 7d27fbfbf3bb2bd7e7d46a4761cc2bba3745569b..de4952098223cddc3681f217856dba9b5d0a0a49 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -95,7 +95,7 @@ static struct Header *OldHdr = NULL;
   }
 
 #define CHECK_ATTACH                                                           \
-  if (OptAttachMsg)                                                          \
+  if (OptAttachMsg)                                                            \
   {                                                                            \
     mutt_flushinp();                                                           \
     mutt_error(_(Function_not_permitted_in_attach_message_mode));              \

diff --git a/pattern.c b/pattern.c
index 5e0b72927946ad31d09a9670374b85985a7990b1..5fea7540b95e7773de388f48dc5f0592d5e3e823 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -1492,7 +1492,8 @@ static int match_content_type(const struct Pattern *pat, struct Body *b)
   return 0;
 }
 
-static int match_mime_content_type(const struct Pattern *pat, struct Context *ctx, struct Header *hdr)
+static int match_mime_content_type(const struct Pattern *pat,
+                                   struct Context *ctx, struct Header *hdr)
 {
   mutt_parse_mime_message(ctx, hdr);
   return match_content_type(pat, hdr->content);
@@ -1762,7 +1763,7 @@ int mutt_pattern_exec(struct Pattern *pat, enum PatternExecFlag flags,
     case MUTT_MIMETYPE:
       if (!ctx)
         return 0;
-      return (pat->not ^ match_mime_content_type (pat, ctx, h));
+      return (pat->not ^ match_mime_content_type(pat, ctx, h));
     case MUTT_UNREFERENCED:
       return (pat->not ^ (h->thread && !h->thread->child));
     case MUTT_BROKEN:

diff --git a/pgppubring.c b/pgppubring.c
index 85ded07690c6149533266f5a3bdb8e7a55cff7cf..ad0bd735f85ff90232d4de6ad64f89f12bff274d 100644 (file)
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -860,9 +860,8 @@ int main(int argc, char *const argv[])
 
       default:
       {
-        fprintf(
-            stderr,
-            "usage: %s [-k <key ring> | [-2 | -5] [ -s] [-S] [-f]] [hints]\n", argv[0]);
+        fprintf(stderr, "usage: %s [-k <key ring> | [-2 | -5] [ -s] [-S] [-f]] [hints]\n",
+                argv[0]);
         exit(1);
       }
     }

diff --git a/progress.c b/progress.c
index 958dac0736b0369f97731ae3d5ce36d9fbc0a482..a791113051a723cfd659c157f45328a38c922aa8 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -171,7 +171,8 @@ void mutt_progress_update(struct Progress *progress, long pos, int percent)
     goto out;
 
   /* refresh if size > inc */
-  if ((progress->flags & MUTT_PROGRESS_SIZE) && (pos >= (progress->pos + (progress->inc << 10))))
+  if ((progress->flags & MUTT_PROGRESS_SIZE) &&
+      (pos >= (progress->pos + (progress->inc << 10))))
     update = true;
   else if (pos >= (progress->pos + progress->inc))
     update = true;
@@ -226,4 +227,3 @@ out:
   if (pos >= progress->size)
     mutt_clear_error();
 }
-

diff --git a/recvattach.c b/recvattach.c
index 03e129c1d225de328dad8ee4de7cdc4afcdb5683..2943c2381db51ee7edaba395ce69cb4f25414d0d 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -1145,7 +1145,7 @@ static const char *Function_not_permitted =
     N_("Function not permitted in attach-message mode.");
 
 #define CHECK_ATTACH                                                           \
-  if (OptAttachMsg)                                                          \
+  if (OptAttachMsg)                                                            \
   {                                                                            \
     mutt_flushinp();                                                           \
     mutt_error(_(Function_not_permitted));                                     \

diff --git a/status.c b/status.c
index e4e9e9e4692caa6dfe5c801171010fc245805a26..d08aaed737fbf80b68201ab192c2c74ae0819cc0 100644 (file)
--- a/status.c
+++ b/status.c
@@ -273,15 +273,14 @@ static const char *status_format_str(char *buf, size_t buflen, size_t col, int c
 
       if (Context)
       {
-        i = OptAttachMsg ?
-                3 :
-                ((Context->readonly || Context->dontwrite) ?
-                     2 :
-                     (Context->changed ||
-                      /* deleted doesn't necessarily mean changed in IMAP */
-                      (Context->magic != MUTT_IMAP && Context->deleted)) ?
-                     1 :
-                     0);
+        i = OptAttachMsg ? 3 :
+                           ((Context->readonly || Context->dontwrite) ?
+                                2 :
+                                (Context->changed ||
+                                 /* deleted doesn't necessarily mean changed in IMAP */
+                                 (Context->magic != MUTT_IMAP && Context->deleted)) ?
+                                1 :
+                                0);
       }
 
       if (!StatusChars || !StatusChars->len)

diff --git a/tags.c b/tags.c
index 863a41d888524ea74535d72d5d0ac47f933039f7..2f05c394a48eee14d4daf5a0cdfc1c5a65a2f6fc 100644 (file)
--- a/tags.c
+++ b/tags.c
@@ -32,7 +32,7 @@
 #include "mutt/mutt.h"
 #include "tags.h"
 
-char *HiddenTags;           /**< Config: Private tags which should not be displayed */
+char *HiddenTags; /**< Config: Private tags which should not be displayed */
 struct Hash *TagTransforms; /**< Lookup table of alternative tag names */
 
 /**