clang-format

diff --git a/browser.c b/browser.c
index 1a364fa641f7ff049b24f7aa16c54eeedcea770a..f0ce3d76420f5290a3f50372878115744cfa88a8 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -1564,8 +1564,7 @@ void mutt_select_file(char *file, size_t filelen, int flags, char ***files, int
 #endif
           else
           {
-            mutt_path_concat(buf, LastDir, state.entry[menu->current].name,
-                                  sizeof(buf));
+            mutt_path_concat(buf, LastDir, state.entry[menu->current].name, sizeof(buf));
           }
 
           enum MailboxType magic = mx_path_probe(buf, NULL);
@@ -1626,8 +1625,7 @@ void mutt_select_file(char *file, size_t filelen, int flags, char ***files, int
             else
             {
               char tmp[PATH_MAX];
-              mutt_path_concat(tmp, LastDir,
-                                    state.entry[menu->current].name, sizeof(tmp));
+              mutt_path_concat(tmp, LastDir, state.entry[menu->current].name, sizeof(tmp));
               mutt_str_strfcpy(LastDir, tmp, sizeof(LastDir));
             }
 
@@ -2133,8 +2131,7 @@ void mutt_select_file(char *file, size_t filelen, int flags, char ***files, int
         {
           char buf2[PATH_MAX];
 
-          mutt_path_concat(buf2, LastDir, state.entry[menu->current].name,
-                                sizeof(buf2));
+          mutt_path_concat(buf2, LastDir, state.entry[menu->current].name, sizeof(buf2));
           struct Body *b = mutt_make_file_attach(buf2);
           if (b)
           {

diff --git a/commands.c b/commands.c
index 5e2b5a0d3327769f2aad6caed5eb5da597db070c..4ed8ab5df0512310e0ca40ac33ffe0335c04933c 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -968,7 +968,8 @@ int mutt_save_message(struct Header *h, bool delete, bool decode, bool decrypt)
   mutt_message(_("Copying to %s..."), buf);
 
 #ifdef USE_IMAP
-  if ((Context->magic == MUTT_IMAP) && !(decode || decrypt) && (imap_path_probe(buf, NULL) == MUTT_IMAP))
+  if ((Context->magic == MUTT_IMAP) && !(decode || decrypt) &&
+      (imap_path_probe(buf, NULL) == MUTT_IMAP))
   {
     switch (imap_copy_messages(Context, h, buf, delete))
     {
@@ -1057,7 +1058,8 @@ int mutt_save_message(struct Header *h, bool delete, bool decode, bool decrypt)
       }
     }
 
-    const bool need_mailbox_cleanup = ((savectx->magic == MUTT_MBOX) || (savectx->magic == MUTT_MMDF));
+    const bool need_mailbox_cleanup =
+        ((savectx->magic == MUTT_MBOX) || (savectx->magic == MUTT_MMDF));
 
     mx_mbox_close(&savectx, NULL);
 

diff --git a/complete.c b/complete.c
index b1010bebbd465f988b58dd89b9ad10301e183635..1f73aafc7d0c3b66e6717336c4c202f0205ffaa8 100644 (file)
--- a/complete.c
+++ b/complete.c
@@ -159,7 +159,7 @@ int mutt_complete(char *buf, size_t buflen)
     {
       char tmp[PATH_MAX];
       if (!mutt_path_concatn(tmp, sizeof(tmp), exp_dirpart, strlen(exp_dirpart),
-                                 buf + 1, (size_t)(p - buf - 1)))
+                             buf + 1, (size_t)(p - buf - 1)))
       {
         return -1;
       }

diff --git a/compose.c b/compose.c
index fc04179a999aff7df6da71531e6f06fe0706aba1..5290dcf30225e6f229532d8c04450bfaecc7e4cf 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -1953,8 +1953,8 @@ int mutt_compose_menu(struct Header *msg, char *fcc, size_t fcclen,
         {
           if (msg->security & (ENCRYPT | SIGN))
           {
-            if (mutt_yesorno(
-                    _("S/MIME already selected. Clear and continue? "), MUTT_YES) != MUTT_YES)
+            if (mutt_yesorno(_("S/MIME already selected. Clear and continue? "),
+                             MUTT_YES) != MUTT_YES)
             {
               mutt_clear_error();
               break;

diff --git a/config/dump.c b/config/dump.c
index 2fce673eed80e43692175c0f3be47a3b7731aeee..4deddf1c05bfc317956ce2aa6520aa1ac696622d 100644 (file)
--- a/config/dump.c
+++ b/config/dump.c
@@ -280,8 +280,8 @@ bool dump_config(struct ConfigSet *cs, int style, int flags)
         if ((type == DT_PATH) && (value->data[0] == '/'))
           mutt_pretty_mailbox(value->data, value->dsize);
 
-        if ((type != DT_BOOL) && (type != DT_NUMBER) && (type != DT_LONG) && (type != DT_QUAD) &&
-            !(flags & CS_DUMP_NO_ESCAPING))
+        if ((type != DT_BOOL) && (type != DT_NUMBER) && (type != DT_LONG) &&
+            (type != DT_QUAD) && !(flags & CS_DUMP_NO_ESCAPING))
         {
           mutt_buffer_reset(tmp);
           size_t len = pretty_var(value->data, tmp);
@@ -302,8 +302,8 @@ bool dump_config(struct ConfigSet *cs, int style, int flags)
         if ((type == DT_PATH) && !(he->type & DT_MAILBOX))
           mutt_pretty_mailbox(initial->data, initial->dsize);
 
-        if ((type != DT_BOOL) && (type != DT_NUMBER) && (type != DT_LONG) && (type != DT_QUAD) &&
-            !(flags & CS_DUMP_NO_ESCAPING))
+        if ((type != DT_BOOL) && (type != DT_NUMBER) && (type != DT_LONG) &&
+            (type != DT_QUAD) && !(flags & CS_DUMP_NO_ESCAPING))
         {
           mutt_buffer_reset(tmp);
           size_t len = pretty_var(initial->data, tmp);

diff --git a/conn/conn_globals.c b/conn/conn_globals.c
index 6b21dcb5373850b53bc11e9f2d5842b7c4d31755..e22d7f43b5ba960b7178c8b8011daf1e0340a6f6 100644 (file)
--- a/conn/conn_globals.c
+++ b/conn/conn_globals.c
@@ -49,10 +49,10 @@ const char *Tunnel = NULL; ///< Config: Shell command to establish a tunnel
 #endif
 
 #ifdef USE_SSL
-bool SslUseSslv3; ///< Config: (ssl) INSECURE: Use SSLv3 for authentication
-bool SslUseTlsv1; ///< Config: (ssl) Use TLSv1 for authentication
-bool SslUseTlsv11; ///< Config: (ssl) Use TLSv1.1 for authentication
-bool SslUseTlsv12; ///< Config: (ssl) Use TLSv1.2 for authentication
+bool SslUseSslv3;    ///< Config: (ssl) INSECURE: Use SSLv3 for authentication
+bool SslUseTlsv1;    ///< Config: (ssl) Use TLSv1 for authentication
+bool SslUseTlsv11;   ///< Config: (ssl) Use TLSv1.1 for authentication
+bool SslUseTlsv12;   ///< Config: (ssl) Use TLSv1.2 for authentication
 bool SslVerifyDates; ///< Config: (ssl) Verify the dates on the server certificate
 bool SslVerifyHost; ///< Config: (ssl) Verify the server's hostname against the certificate
 #endif

diff --git a/conn/sasl.c b/conn/sasl.c
index e0191622c688d2c084ad2ee69f04fd6ff6f1d2aa..bf70531fffcdbd02af00268a31f7f321647260b6 100644 (file)
--- a/conn/sasl.c
+++ b/conn/sasl.c
@@ -388,8 +388,9 @@ static int mutt_sasl_conn_read(struct Connection *conn, char *buf, size_t buflen
   /* if we still have data in our read buffer, copy it into buf */
   if (sasldata->blen > sasldata->bpos)
   {
-    olen = (sasldata->blen - sasldata->bpos > buflen) ? buflen :
-                                                     sasldata->blen - sasldata->bpos;
+    olen = (sasldata->blen - sasldata->bpos > buflen) ?
+               buflen :
+               sasldata->blen - sasldata->bpos;
 
     memcpy(buf, sasldata->buf + sasldata->bpos, olen);
     sasldata->bpos += olen;
@@ -420,8 +421,9 @@ static int mutt_sasl_conn_read(struct Connection *conn, char *buf, size_t buflen
       }
     } while (sasldata->blen == 0);
 
-    olen = (sasldata->blen - sasldata->bpos > buflen) ? buflen :
-                                                     sasldata->blen - sasldata->bpos;
+    olen = (sasldata->blen - sasldata->bpos > buflen) ?
+               buflen :
+               sasldata->blen - sasldata->bpos;
 
     memcpy(buf, sasldata->buf, olen);
     sasldata->bpos += olen;

diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c
index e5a055857474a3a357cfc092011b4755dd86b27f..ddcade354226a3fd07b6e002d430bd22a67cfc2f 100644 (file)
--- a/conn/ssl_gnutls.c
+++ b/conn/ssl_gnutls.c
@@ -257,8 +257,8 @@ static gnutls_certificate_status_t tls_verify_peers(gnutls_session_t tlsstate)
  * @param buflen Length of the buffer
  * @param data Certificate
  */
-static void tls_fingerprint(gnutls_digest_algorithm_t algo, char *buf, size_t buflen,
-                            const gnutls_datum_t *data)
+static void tls_fingerprint(gnutls_digest_algorithm_t algo, char *buf,
+                            size_t buflen, const gnutls_datum_t *data)
 {
   unsigned char md[36];
   size_t n;

diff --git a/curs_main.c b/curs_main.c
index f4d3bed3287dae2f05cbb158cebd37e96cfd8591..73636019c478624a6c1babd3bab526c8bde59102 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -88,11 +88,11 @@
 
 /* These Config Variables are only used in curs_main.c */
 bool ChangeFolderNext; ///< Config: Suggest the next folder, rather than the first when using '<change-folder>'
-bool CollapseAll; ///< Config: Collapse all threads when entering a folder
+bool CollapseAll;      ///< Config: Collapse all threads when entering a folder
 bool CollapseFlagged; ///< Config: Prevent the collapse of threads with flagged emails
 bool CollapseUnread; ///< Config: Prevent the collapse of threads with unread emails
 char *MarkMacroPrefix; ///< Config: Prefix for macros using '<mark-message>'
-bool PgpAutoDecode; ///< Config: Automatically decrypt PGP messages
+bool PgpAutoDecode;    ///< Config: Automatically decrypt PGP messages
 bool UncollapseJump; ///< Config: When opening a thread, jump to the next unread message
 bool UncollapseNew; ///< Config: Open collapsed threads when new mail arrives
 
@@ -549,7 +549,8 @@ static int main_change_folder(struct Menu *menu, int op, char *buf,
    * switch statement would need to be run. */
   mutt_folder_hook(buf);
 
-  const int flags = (ReadOnly || (op == OP_MAIN_CHANGE_FOLDER_READONLY)) ? MUTT_READONLY : 0;
+  const int flags =
+      (ReadOnly || (op == OP_MAIN_CHANGE_FOLDER_READONLY)) ? MUTT_READONLY : 0;
   Context = mx_mbox_open(buf, flags);
   if (Context)
   {

diff --git a/editmsg.c b/editmsg.c
index 353a3f3a9dbfd286da8672f63bfa7402690f26c5..97c42ec8c58bd9c97f1e9c7ecd8153380e0772ec 100644 (file)
--- a/editmsg.c
+++ b/editmsg.c
@@ -93,7 +93,8 @@ static int edit_or_view_one_message(bool edit, struct Context *ctx, struct Heade
     return -1;
   }
 
-  const int chflags = CH_NOLEN | ((ctx->magic == MUTT_MBOX || ctx->magic == MUTT_MMDF) ? 0 : CH_NOSTATUS);
+  const int chflags =
+      CH_NOLEN | ((ctx->magic == MUTT_MBOX || ctx->magic == MUTT_MMDF) ? 0 : CH_NOSTATUS);
   rc = mutt_append_message(tmpctx, ctx, cur, 0, chflags);
   oerrno = errno;
 

diff --git a/email/email_globals.c b/email/email_globals.c
index c99c5e9fad81f69eebd49734f0ecae4d48ea9ab7..34801f9e429b37de53da17dc9c2401b24b499f39 100644 (file)
--- a/email/email_globals.c
+++ b/email/email_globals.c
@@ -33,7 +33,7 @@
 /* Config items */
 bool MarkOld = false; ///< Config: Mark new emails as old when leaving the mailbox
 struct Regex *ReplyRegex = NULL; ///< Config: Regex to match message reply subjects like "re: "
-char *SendCharset = NULL;   ///< Config: Character sets for outgoing mail ///< Config: List of character sets for outgoing messages
+char *SendCharset = NULL; ///< Config: Character sets for outgoing mail ///< Config: List of character sets for outgoing messages
 char *SpamSeparator = NULL; ///< Config: Separator for multiple spam headers ///< Config: Separator for spam headers
 bool Weed = false; ///< Config: Filter headers when displaying/forwarding/printing/replying
 

diff --git a/email/rfc2047.c b/email/rfc2047.c
index 2fc714e62f018f257c6031cd69bb92f3766766a0..3af6a98559126bd6f1c05187dc20ded7520bfde4 100644 (file)
--- a/email/rfc2047.c
+++ b/email/rfc2047.c
@@ -769,8 +769,7 @@ void rfc2047_decode_addrlist(struct Address *a)
 {
   while (a)
   {
-    if (a->personal &&
-        ((strstr(a->personal, "=?")) || (AssumedCharset && *AssumedCharset)))
+    if (a->personal && ((strstr(a->personal, "=?")) || (AssumedCharset && *AssumedCharset)))
     {
       rfc2047_decode(&a->personal);
     }

diff --git a/imap/imap.c b/imap/imap.c
index 191e1e5babd3731a8e7cef98f0ad5c106ad17d59..49af264ceb94f61b471b2406835d93431cd2877b 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -2051,8 +2051,8 @@ static int imap_mbox_open(struct Context *ctx)
   }
   /* pipeline the postponed count if possible */
   pmx.mbox = NULL;
-  if ((imap_path_probe(Postponed, NULL) == MUTT_IMAP) && !imap_parse_path(Postponed, &pmx) &&
-      mutt_account_match(&pmx.account, &mx.account))
+  if ((imap_path_probe(Postponed, NULL) == MUTT_IMAP) &&
+      !imap_parse_path(Postponed, &pmx) && mutt_account_match(&pmx.account, &mx.account))
   {
     imap_status(Postponed, true);
   }

diff --git a/keymap.c b/keymap.c
index 8fbde0496fbe1f0e88578a3815fb2566e25a303f..ccd4fb933bd6da8fd4f653305eb54fde00ddbe43 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -275,7 +275,8 @@ static size_t parsekeys(const char *str, keycode_t *d, size_t max)
  * Insert a key sequence into the specified map.
  * The map is sorted by ASCII value (lowest to highest)
  */
-static int km_bind_err(const char *s, int menu, int op, char *macro, char *desc, struct Buffer *err)
+static int km_bind_err(const char *s, int menu, int op, char *macro, char *desc,
+                       struct Buffer *err)
 {
   int retval = 0;
   struct Keymap *last = NULL, *next = NULL;

diff --git a/mailbox.c b/mailbox.c
index 863dfe2a0517075897357f6942dbe4a9ae55e549..9408f5152c9b48f29557685b0af480555abd6059 100644 (file)
--- a/mailbox.c
+++ b/mailbox.c
@@ -358,7 +358,8 @@ static int mailbox_mbox_check(struct Mailbox *mailbox, struct stat *sb, bool che
 
   if (check_stats && (mailbox->stats_last_checked < sb->st_mtime))
   {
-    struct Context *ctx = mx_mbox_open(mailbox->path, MUTT_READONLY | MUTT_QUIET | MUTT_NOSORT | MUTT_PEEK);
+    struct Context *ctx =
+        mx_mbox_open(mailbox->path, MUTT_READONLY | MUTT_QUIET | MUTT_NOSORT | MUTT_PEEK);
     if (ctx)
     {
       mailbox->msg_count = ctx->msgcount;
@@ -413,7 +414,8 @@ static void mailbox_check(struct Mailbox *tmp, struct stat *contex_sb, bool chec
     else
 #endif
         if (stat(tmp->path, &sb) != 0 || (S_ISREG(sb.st_mode) && sb.st_size == 0) ||
-            ((tmp->magic == MUTT_UNKNOWN) && (tmp->magic = mx_path_probe(tmp->path, NULL)) <= 0))
+            ((tmp->magic == MUTT_UNKNOWN) &&
+             (tmp->magic = mx_path_probe(tmp->path, NULL)) <= 0))
     {
       /* if the mailbox still doesn't exist, set the newly created flag to be
        * ready for when it does. */

diff --git a/maildir/mh.c b/maildir/mh.c
index 7e158903a9ad058f65a3dc0945b5e37e706bdb06..1e6109ce41b2722a0c5fe7cc3f5dc1cc5029cd15 100644 (file)
--- a/maildir/mh.c
+++ b/maildir/mh.c
@@ -68,7 +68,7 @@
 /* These Config Variables are only used in maildir/mh.c */
 bool CheckNew; ///< Config: (maildir,mh) Check for new mail while the mailbox is open
 bool MaildirHeaderCacheVerify; ///< Config: (hcache) Check for maildir changes when opening mailbox
-bool MhPurge; ///< Config: Really delete files in MH mailboxes
+bool MhPurge;       ///< Config: Really delete files in MH mailboxes
 char *MhSeqFlagged; ///< Config: MH sequence for flagged message
 char *MhSeqReplied; ///< Config: MH sequence to tag replied messages
 char *MhSeqUnseen;  ///< Config: MH sequence for unseen messages
@@ -881,8 +881,8 @@ static void maildir_update_mtime(struct Context *ctx)
  * Actually parse a maildir message.  This may also be used to fill
  * out a fake header structure generated by lazy maildir parsing.
  */
-struct Header *maildir_parse_stream(enum MailboxType magic, FILE *f, const char *fname,
-                                    bool is_old, struct Header *h)
+struct Header *maildir_parse_stream(enum MailboxType magic, FILE *f,
+                                    const char *fname, bool is_old, struct Header *h)
 {
   struct stat st;
 
@@ -923,8 +923,8 @@ struct Header *maildir_parse_stream(enum MailboxType magic, FILE *f, const char
  * This may also be used to fill out a fake header structure generated by lazy
  * maildir parsing.
  */
-struct Header *maildir_parse_message(enum MailboxType magic, const char *fname, bool is_old,
-                                     struct Header *h)
+struct Header *maildir_parse_message(enum MailboxType magic, const char *fname,
+                                     bool is_old, struct Header *h)
 {
   FILE *f = fopen(fname, "r");
   if (!f)

diff --git a/mbox/mbox.c b/mbox/mbox.c
index 1a6fe1e60e61fd36b2e1f8d3489e4dc5600925f3..7eeff862eb0baf0b9d6f27971bfcd2344341556a 100644 (file)
--- a/mbox/mbox.c
+++ b/mbox/mbox.c
@@ -364,8 +364,7 @@ static int mbox_parse_mailbox(struct Context *ctx)
           /* check to see if the content-length looks valid.  we expect to
            * to see a valid message separator at this point in the stream
            */
-          if (fseeko(ctx->fp, tmploc, SEEK_SET) != 0 ||
-              !fgets(buf, sizeof(buf), ctx->fp) ||
+          if (fseeko(ctx->fp, tmploc, SEEK_SET) != 0 || !fgets(buf, sizeof(buf), ctx->fp) ||
               (mutt_str_strncmp("From ", buf, 5) != 0))
           {
             mutt_debug(1, "bad content-length in message %d (cl=" OFF_T_FMT ")\n",

diff --git a/mutt/charset.c b/mutt/charset.c
index 06a527167dfdfbc7f659618609ed2fb78381b45f..a13c5cdddf9e595e586fde7d9e2849851a7ef691 100644 (file)
--- a/mutt/charset.c
+++ b/mutt/charset.c
@@ -1007,7 +1007,7 @@ char *mutt_ch_choose(const char *fromcode, const char *charsets, char *u,
 
     s = mutt_str_substr_dup(u, u + ulen);
     const int rc = d ? mutt_ch_convert_string(&s, fromcode, t, 0) :
-                                 mutt_ch_check(s, ulen, fromcode, t);
+                       mutt_ch_check(s, ulen, fromcode, t);
     if (rc)
     {
       FREE(&t);

diff --git a/mx.c b/mx.c
index 3ea1e3e459e6477ecc0b035db23b62b29f9166f5..ff09e2ecaedf93d9393f3e3b4e36056432f2f1ec 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -87,7 +87,7 @@
 /* These Config Variables are only used in mx.c */
 unsigned char CatchupNewsgroup; ///< Config: (nntp) Mark all articles as read when leaving a newsgroup
 bool KeepFlagged; ///< Config: Don't move flagged messages from Spoolfile to Mbox
-short MboxType;     ///< Config: Default type for creating new mailboxes
+short MboxType;   ///< Config: Default type for creating new mailboxes
 unsigned char Move; ///< Config: Move emails from Spoolfile to Mbox when read
 char *Trash;        ///< Config: Folder to put deleted emails
 
@@ -95,7 +95,7 @@ char *Trash;        ///< Config: Folder to put deleted emails
  * mx_ops - All the Mailbox backends
  */
 static const struct MxOps *mx_ops[] = {
-  /* These mailboxes can be recognised by their Url scheme */
+/* These mailboxes can be recognised by their Url scheme */
 #ifdef USE_IMAP
   &mx_imap_ops,
 #endif
@@ -115,7 +115,7 @@ static const struct MxOps *mx_ops[] = {
   &mx_mh_ops,
   &mx_mmdf_ops,
 
-  /* If everything else fails... */
+/* If everything else fails... */
 #ifdef USE_COMPRESSED
   &mx_comp_ops,
 #endif

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index d4d97f0eb5eada6aabf672da03814a60876a8cdb..f05eee90e979b14cb5aaea86aac2c1c3feba77ff 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -2496,8 +2496,8 @@ static void copy_clearsigned(gpgme_data_t data, struct State *s, char *charset)
    */
   struct FgetConv *fc = mutt_ch_fgetconv_open(fp, charset, Charset, MUTT_ICONV_HOOK_FROM);
 
-  for (complete = true, armor_header = true; mutt_ch_fgetconvs(buf, sizeof(buf), fc);
-       complete = (strchr(buf, '\n')))
+  for (complete = true, armor_header = true;
+       mutt_ch_fgetconvs(buf, sizeof(buf), fc); complete = (strchr(buf, '\n')))
   {
     if (!complete)
     {

diff --git a/ncrypt/crypt_mod.c b/ncrypt/crypt_mod.c
index 0d7c504e2be1ef7ba8a86405a92d74579f734eb4..7bd7394ec1ba7136b6f8004e74442e17f1cd0a40 100644 (file)
--- a/ncrypt/crypt_mod.c
+++ b/ncrypt/crypt_mod.c
@@ -86,4 +86,3 @@ void crypto_module_free(void)
     FREE(&np);
   }
 }
-

diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 734054bb8de0960eddea1ac1183a2c9570f53923..38b57e41f2dc0798bf7b4ce618d257f737de8a9a 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -70,8 +70,8 @@
 bool PgpCheckExit; ///< Config: Check the exit code of PGP subprocess
 bool PgpCheckGpgDecryptStatusFd; ///< Config: File descriptor used for status info
 struct Regex *PgpDecryptionOkay; ///< Config: Text indicating a successful decryption
-struct Regex *PgpGoodSign; ///< Config: Text indicating a good signature
-long PgpTimeout; ///< Config: Time in seconds to cache a passphrase
+struct Regex *PgpGoodSign;       ///< Config: Text indicating a good signature
+long PgpTimeout;     ///< Config: Time in seconds to cache a passphrase
 bool PgpUseGpgAgent; ///< Config: Use a PGP agent for caching passwords
 
 char PgpPass[LONG_STRING];
@@ -331,7 +331,7 @@ static int pgp_check_pgp_decryption_okay_regex(FILE *fpin)
 /**
  * pgp_check_decryption_okay - Check GPG output for status codes
  * @param fpin File to read from
- * @retval  1 - no patterns were matched (if delegated to decryption_okay_regexp)
+ * @retval  1 - no patterns were matched (if delegated to decryption_okay_regex)
  * @retval  0 - DECRYPTION_OKAY was seen, with no PLAINTEXT outside.
  * @retval -1 - No decryption status codes were encountered
  * @retval -2 - PLAINTEXT was encountered outside of DECRYPTION delimeters.
@@ -425,8 +425,8 @@ static void pgp_copy_clearsigned(FILE *fpin, struct State *s, char *charset)
    */
   struct FgetConv *fc = mutt_ch_fgetconv_open(fpin, charset, Charset, MUTT_ICONV_HOOK_FROM);
 
-  for (complete = true, armor_header = true; mutt_ch_fgetconvs(buf, sizeof(buf), fc);
-       complete = (strchr(buf, '\n')))
+  for (complete = true, armor_header = true;
+       mutt_ch_fgetconvs(buf, sizeof(buf), fc); complete = (strchr(buf, '\n')))
   {
     if (!complete)
     {

diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index 26510488f38718f3f8c644487082645e1ece92d7..135a1ecae31f3903e6aff674f2a2611379f83b04 100644 (file)
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -74,7 +74,7 @@
 int NmDbLimit;       ///< Config: (notmuch) Default limit for Notmuch queries
 char *NmDefaultUri;  ///< Config: (notmuch) Path to the Notmuch database
 char *NmExcludeTags; ///< Config: (notmuch) Exclude messages with these tags
-int NmOpenTimeout; ///< Config: (notmuch) Database timeout
+int NmOpenTimeout;   ///< Config: (notmuch) Database timeout
 char *NmQueryType; ///< Config: (notmuch) Default query type: 'threads' or 'messages'
 int NmQueryWindowCurrentPosition; ///< Config: (notmuch) Position of current search window
 char *NmQueryWindowTimebase; ///< Config: (notmuch) Units for the time duration

diff --git a/pager.c b/pager.c
index c2ef567861cef743f039afc5bf51ac629ff3fa9a..9c1d360dd8f66ec7a7fddce3f88a2d6a9c2b0886 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -83,7 +83,7 @@ short PagerIndexLines; ///< Config: Number of index lines to display above the p
 bool PagerStop; ///< Config: Don't automatically open the next message when at the end of a message
 short SearchContext; ///< Config: Context to display around search matches
 short SkipQuotedOffset; ///< Config: Lines of context to show when skipping quoted text
-bool SmartWrap; ///< Config: Wrap text at word boundaries
+bool SmartWrap;         ///< Config: Wrap text at word boundaries
 struct Regex *Smileys; ///< Config: Regex to match smileys to prevent mistakes when quoting text
 bool Tilde; ///< Config: Character to pad blank lines in the pager
 
@@ -725,7 +725,7 @@ static struct QClass *classify_quote(struct QClass **quote_list, const char *qpt
           {
             /* longer than the current prefix: try subclassing it */
             if (!tmp && (mutt_str_strncmp(tail_qptr, (q_list->prefix) + offset,
-                                                 q_list->length - offset) == 0))
+                                          q_list->length - offset) == 0))
             {
               /* still a subclass: go down one level */
               ptr = q_list;

diff --git a/pop/pop.c b/pop/pop.c
index e204720f683632191cbfd55bd8dc11bd84b0427e..62fc18f7c319990c6f647f38c04b0ba5642e3a0c 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -67,7 +67,7 @@ struct BodyCache;
 short PopCheckinterval; ///< Config: (pop) Interval between checks for new mail
 unsigned char PopDelete; ///< Config: (pop) After downloading POP messages, delete them on the server
 char *PopHost; ///< Config: (pop) Url of the POP server
-bool PopLast; ///< Config: (pop) Use the 'LAST' command to fetch new mail
+bool PopLast;  ///< Config: (pop) Use the 'LAST' command to fetch new mail
 
 #ifdef USE_HCACHE
 #define HC_FNAME "neomutt" /* filename for hcache as POP lacks paths */

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index c4cc8f80394a240f93849b060e31946619cf57c3..98af616058b4d6b6b7002fe116c92c15d0f78f03 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -508,8 +508,8 @@ int pop_query_d(struct PopData *pop_data, char *buf, size_t buflen, char *msg)
  * This function calls  func(*line, *data)  for each received line,
  * func(NULL, *data)  if  rewind(*data)  needs, exits when fail or done.
  */
-int pop_fetch_data(struct PopData *pop_data, const char *query, struct Progress *progressbar,
-                   int (*func)(char *, void *), void *data)
+int pop_fetch_data(struct PopData *pop_data, const char *query,
+                   struct Progress *progressbar, int (*func)(char *, void *), void *data)
 {
   char buf[LONG_STRING];
   long pos = 0;

diff --git a/recvattach.c b/recvattach.c
index e4560d6973f78e28d7929f3cefd2e44d0e944bdb..c4bfc613151802062aa1219245ef7eb1fd5e9375 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -64,7 +64,7 @@
 
 /* These Config Variables are only used in recvattach.c */
 char *AttachSep; ///< Config: Separator to add between saved/printed/piped attachments
-bool AttachSplit; ///< Config: Save/print/pipe tagged messages individually
+bool AttachSplit;    ///< Config: Save/print/pipe tagged messages individually
 bool DigestCollapse; ///< Config: Hide the subparts of a multipart/digest
 char *MessageFormat; ///< Config: printf-like format string for listing attached messages
 
@@ -491,8 +491,7 @@ static int query_save_attachment(FILE *fp, struct Body *body,
   {
     if (directory && *directory)
     {
-      mutt_path_concat(buf, *directory, mutt_path_basename(body->filename),
-                            sizeof(buf));
+      mutt_path_concat(buf, *directory, mutt_path_basename(body->filename), sizeof(buf));
     }
     else
       mutt_str_strfcpy(buf, body->filename, sizeof(buf));

diff --git a/recvcmd.c b/recvcmd.c
index b595e60c58b1baba30c6934b4a3f4694520f9b9b..e087e806f0cdbc6c55b7cd85fe585bc65dc3834d 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -1019,8 +1019,7 @@ void mutt_attach_reply(FILE *fp, struct Header *hdr, struct AttachCtx *actx,
 
     mutt_make_post_indent(Context, parent_hdr, tmpfp);
 
-    if (mime_reply_any && !cur &&
-        !copy_problematic_attachments(&tmphdr->content, actx, false))
+    if (mime_reply_any && !cur && !copy_problematic_attachments(&tmphdr->content, actx, false))
     {
       mutt_header_free(&tmphdr);
       mutt_file_fclose(&tmpfp);

diff --git a/send.c b/send.c
index 70f5bcec1c52a1687c96d2ec000fbdd3494074d3..8b569607ef25b3d70d2a74f5b07e4f55613b856f 100644 (file)
--- a/send.c
+++ b/send.c
@@ -81,12 +81,12 @@ unsigned char AbortUnmodified; ///< Config: Abort the sending if the message has
 bool AskFollowUp; ///< Config: (nntp) Ask the user for follow-up groups before editing
 bool AskXCommentTo; ///< Config: (nntp) Ask the user for the 'X-Comment-To' field before editing
 char *ContentType; ///< Config: Default "Content-Type" for newly composed messages
-bool CryptAutoencrypt; ///< Config: Automatically PGP encrypt all outgoing mail
-bool CryptAutopgp; ///< Config: Allow automatic PGP functions
-bool CryptAutosign; ///< Config: Automatically PGP sign all outgoing mail
-bool CryptAutosmime; ///< Config: Allow automatic SMIME functions
+bool CryptAutoencrypt;  ///< Config: Automatically PGP encrypt all outgoing mail
+bool CryptAutopgp;      ///< Config: Allow automatic PGP functions
+bool CryptAutosign;     ///< Config: Automatically PGP sign all outgoing mail
+bool CryptAutosmime;    ///< Config: Allow automatic SMIME functions
 bool CryptReplyencrypt; ///< Config: Encrypt replies to encrypted messages
-bool CryptReplysign; ///< Config: Sign replies to signed messages
+bool CryptReplysign;    ///< Config: Sign replies to signed messages
 bool CryptReplysignencrypted; ///< Config: Sign replies to encrypted messages
 char *EmptySubject; ///< Config: Subject to use when replying to an email with none
 bool FastReply; ///< Config: Don't prompt for the recipients and subject when replying/forwarding
@@ -98,7 +98,7 @@ char *ForwardAttributionTrailer; ///< Config: Suffix message for forwarded messa
 unsigned char ForwardEdit; ///< Config: Automatically start the editor when forwarding a message
 char *ForwardFormat; ///< Config: printf-like format string to control the subject when forwarding a message
 bool ForwardReferences; ///< Config: Set the 'In-Reply-To' and 'References' headers when forwarding a message
-bool Hdrs; ///< Config: Add custom headers to outgoing mail
+bool Hdrs;              ///< Config: Add custom headers to outgoing mail
 unsigned char HonorFollowupTo; ///< Config: Honour the 'Mail-Followup-To' header when group replying
 bool IgnoreListReplyTo; ///< Config: Ignore the 'Reply-To' header when using `<reply>` on a mailing list
 unsigned char Include; ///< Config: Include a copy of the email that's being replied to
@@ -106,7 +106,7 @@ bool Metoo; ///< Config: Remove the user's address from the list of recipients
 bool NmRecord; ///< Config: (notmuch) If the 'record' mailbox (sent mail) should be indexed
 bool PgpReplyinline; ///< Config: Reply using old-style inline PGP messages (not recommended)
 char *PostIndentString; ///< Config: Suffix message to add after reply text
-bool PostponeEncrypt; ///< Config: Self-encrypt postponed messages
+bool PostponeEncrypt;   ///< Config: Self-encrypt postponed messages
 char *PostponeEncryptAs; ///< Config: Fallback encryption key for postponed messages
 unsigned char Recall; ///< Config: Recall postponed mesaages when asked to compose a message
 bool ReplySelf; ///< Config: Really reply to yourself, when replying to your own email
@@ -114,10 +114,10 @@ unsigned char ReplyTo; ///< Config: Address to use as a 'Reply-To' header
 bool ReplyWithXorig; ///< Config: Create 'From' header from 'X-Original-To' header
 bool ReverseName; ///< Config: Set the 'From' from the address the email was sent to
 bool ReverseRealname; ///< Config: Set the 'From' from the full 'To' address the email was sent to
-bool SigDashes; ///< Config: Insert '-- ' before the signature
+bool SigDashes;  ///< Config: Insert '-- ' before the signature
 char *Signature; ///< Config: File containing a signature to append to all mail
-bool SigOnTop; ///< Config: Insert the signature before the quoted text
-bool UseFrom; ///< Config: Set the 'From' header for outgoing mail
+bool SigOnTop;   ///< Config: Insert the signature before the quoted text
+bool UseFrom;    ///< Config: Set the 'From' header for outgoing mail
 
 /**
  * append_signature - Append a signature to an email

diff --git a/sendlib.c b/sendlib.c
index ad48d3a19a8246146b574d45f3473d72b5f72fdb..1857106863d5eaba04c859ebbb64f204ed8e4e31 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -74,15 +74,15 @@ bool ForwardDecrypt; ///< Config: Decrypt the message when forwarding it
 bool HiddenHost; ///< Config: Don't use the hostname, just the domain, when generating the message id
 char *Inews;     ///< Config: (nntp) External command to post news articles
 bool MimeForwardDecode; ///< Config: Decode the forwarded message before attaching it
-bool MimeSubject; ///< Config: (nntp) Encode the article subject in base64
+bool MimeSubject;       ///< Config: (nntp) Encode the article subject in base64
 char *MimeTypeQueryCommand; ///< Config: External command to determine the MIME type of an attachment
 bool MimeTypeQueryFirst; ///< Config: Run the MimeTypeQueryCommand before the mime.types lookup
-char *Sendmail; ///< Config: External command to send email
-short SendmailWait; ///< Config: Time to wait for sendmail to finish
-bool Use8bitmime; ///< Config: Use 8-bit messages and ESMTP to send messages
+char *Sendmail;       ///< Config: External command to send email
+short SendmailWait;   ///< Config: Time to wait for sendmail to finish
+bool Use8bitmime;     ///< Config: Use 8-bit messages and ESMTP to send messages
 bool UseEnvelopeFrom; ///< Config: Set the envelope sender of the message
-bool UserAgent; ///< Config: Add a 'User-Agent' head to outgoing mail
-short WrapHeaders; ///< Config: Width to wrap headers in outgoing messages
+bool UserAgent;       ///< Config: Add a 'User-Agent' head to outgoing mail
+short WrapHeaders;    ///< Config: Width to wrap headers in outgoing messages
 
 /**
  * encode_quoted - Encode text as quoted printable

diff --git a/sort.c b/sort.c
index 1797e40f188665ea422583e936afcbcbc5508a92..a4551ee92ce7d571829a6eb0d926ea0a09ad6067 100644 (file)
--- a/sort.c
+++ b/sort.c
@@ -408,8 +408,7 @@ void mutt_sort_headers(struct Context *ctx, bool init)
     }
     mutt_sort_threads(ctx, init);
   }
-  else if (!(sortfunc = mutt_get_sort_func(Sort)) ||
-           !(AuxSort = mutt_get_sort_func(SortAux)))
+  else if (!(sortfunc = mutt_get_sort_func(Sort)) || !(AuxSort = mutt_get_sort_func(SortAux)))
   {
     mutt_error(_("Could not find sorting function [report this bug]"));
     return;