clang-format

diff --git a/alias.c b/alias.c
index 729ee0e68c24d82964b50195b97988e37abd839b..d028ec85be6383d0b1b9edcda8b777b5d5e01e96 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -36,9 +36,9 @@
 #include "mutt.h"
 #include "address.h"
 #include "alias.h"
-#include "mutt_charset.h"
 #include "envelope.h"
 #include "globals.h"
+#include "mutt_charset.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "options.h"

diff --git a/browser.c b/browser.c
index 9dde941a3758ed00063ef691fd5f1ccafd8533a9..e261086d75c91fcc87fcb49fc1ccd9a8cd5cce64 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -46,7 +46,6 @@
 #include "body.h"
 #include "browser.h"
 #include "buffy.h"
-#include "mutt_charset.h"
 #include "context.h"
 #include "format_flags.h"
 #include "globals.h"
@@ -54,6 +53,7 @@
 #include "mailbox.h"
 #include "mbyte.h"
 #include "mutt_account.h"
+#include "mutt_charset.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mutt_regex.h"

diff --git a/handler.c b/handler.c
index 694a5617d41687238bca97fb56330dfe5eff4137..737e8a9ee73cd37f1ea77e564d5f0ca0f4ded08f 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -40,12 +40,12 @@
 #include "mutt/mutt.h"
 #include "mutt.h"
 #include "body.h"
-#include "mutt_charset.h"
 #include "copy.h"
 #include "filter.h"
 #include "globals.h"
 #include "keymap.h"
 #include "mime.h"
+#include "mutt_charset.h"
 #include "mutt_curses.h"
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"

diff --git a/hcache/hcache.c b/hcache/hcache.c
index c5bb942dc5d334a9eef9e5ccf689d55c1a76fbc2..9d5ded3df5ab74ed1a05a3509623a8d7328f337a 100644 (file)
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -51,13 +51,13 @@
 #include "address.h"
 #include "backend.h"
 #include "body.h"
-#include "mutt_charset.h"
 #include "envelope.h"
 #include "globals.h"
 #include "hcache.h"
 #include "hcache/hcversion.h"
 #include "header.h"
 #include "mbyte.h"
+#include "mutt_charset.h"
 #include "mutt_regex.h"
 #include "parameter.h"
 #include "protos.h"

diff --git a/history.c b/history.c
index 0f5921ac93a43007a8a1c927f2094bcccea38373..262bd24ad8d8d0e5837151ccdc020d48e8070bcd 100644 (file)
--- a/history.c
+++ b/history.c
@@ -28,8 +28,8 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "history.h"
-#include "mutt_charset.h"
 #include "globals.h"
+#include "mutt_charset.h"
 #include "protos.h"
 
 /* This history ring grows from 0..History, with last marking the

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index 461790d2d2a388a53e2255d96900058fbb18f3b1..40adcfae16ab94d0b76ed078f238aa1047292fd9 100644 (file)
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -239,7 +239,7 @@ enum ImapAuthRes imap_auth_gss(struct ImapData *idata, const char *method)
   }
   mutt_debug(2, "Credential exchange complete\n");
 
-/* first octet is security levels supported. We want NONE */
+  /* first octet is security levels supported. We want NONE */
   server_conf_flags = ((char *) send_token.value)[0];
   if (!(((char *) send_token.value)[0] & GSS_AUTH_P_NONE))
   {

diff --git a/imap/utf7.c b/imap/utf7.c
index abfcaf1d8b5107e43d8628278123397dc8947863..a3ef996a07ff7a7e35d99aa55c4b090bac59a40a 100644 (file)
--- a/imap/utf7.c
+++ b/imap/utf7.c
@@ -35,8 +35,8 @@
 #include <string.h>
 #include "imap_private.h"
 #include "mutt/mutt.h"
-#include "mutt_charset.h"
 #include "globals.h"
+#include "mutt_charset.h"
 
 // clang-format off
 /**

diff --git a/init.c b/init.c
index d9d7ccea0568fb8a85d644dd19839fef54477d3c..1a0fda6428aa7564a5f8d2d0b5bc7480f777053d 100644 (file)
--- a/init.c
+++ b/init.c
@@ -41,7 +41,6 @@
 #include "init.h"
 #include "address.h"
 #include "alias.h"
-#include "mutt_charset.h"
 #include "context.h"
 #include "envelope.h"
 #include "filter.h"
@@ -53,6 +52,7 @@
 #include "mailbox.h"
 #include "mbtable.h"
 #include "mbyte.h"
+#include "mutt_charset.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "mutt_menu.h"
@@ -2754,7 +2754,8 @@ static int parse_set(struct Buffer *tmp, struct Buffer *s, unsigned long data,
         {
           if (mutt_str_strcmp(MuttVars[idx].option, "debug_file") == 0 && debugfile_cmdline)
           {
-            mutt_message(_("set debug_file ignored, it has been overridden by the cmdline"));
+            mutt_message(_("set debug_file ignored, it has been overridden by "
+                           "the cmdline"));
             break;
           }
           /* MuttVars[idx].data is already 'char**' (or some 'void**') or...
@@ -2923,7 +2924,8 @@ static int parse_set(struct Buffer *tmp, struct Buffer *s, unsigned long data,
       }
       else if (mutt_str_strcmp(MuttVars[idx].option, "debug_level") == 0 && debuglevel_cmdline)
       {
-        mutt_message(_("set debug_level ignored, it has been overridden by the cmdline"));
+        mutt_message(_(
+            "set debug_level ignored, it has been overridden by the cmdline"));
         break;
       }
       else

diff --git a/mutt_idna.c b/mutt_idna.c
index d9dbb6af87b72b1c927b235482ab4cfb1413e45c..cf05b397883bbede28a469efe1785f458e27b18f 100644 (file)
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -27,9 +27,9 @@
 #include "mutt/mutt.h"
 #include "mutt_idna.h"
 #include "address.h"
-#include "mutt_charset.h"
 #include "envelope.h"
 #include "globals.h"
+#include "mutt_charset.h"
 #include "options.h"
 
 #ifdef HAVE_LIBIDN

diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index 3cdc8c37f57ecb146d8060ef3a415e19ca7cae93..ad8950d5acbe13a86fdad1448af1e07727306e92 100644 (file)
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -68,11 +68,11 @@
 #endif
 
 /* @def The definition in <notmuch.h> is broken */
-#define LIBNOTMUCH_CHECK_VERSION(major, minor, micro)                            \
-  (LIBNOTMUCH_MAJOR_VERSION > (major) ||                                           \
+#define LIBNOTMUCH_CHECK_VERSION(major, minor, micro)                             \
+  (LIBNOTMUCH_MAJOR_VERSION > (major) ||                                          \
    (LIBNOTMUCH_MAJOR_VERSION == (major) && LIBNOTMUCH_MINOR_VERSION > (minor)) || \
-   (LIBNOTMUCH_MAJOR_VERSION == (major) && LIBNOTMUCH_MINOR_VERSION == (minor) && \
-    LIBNOTMUCH_MICRO_VERSION >= (micro)))
+   (LIBNOTMUCH_MAJOR_VERSION == (major) &&                                        \
+    LIBNOTMUCH_MINOR_VERSION == (minor) && LIBNOTMUCH_MICRO_VERSION >= (micro)))
 
 /**
  * enum NmQueryType - Notmuch Query Types

diff --git a/muttlib.c b/muttlib.c
index 84292201a46410ba921979e4617c2f322e528e51..a7e3f79fd84fa0f27f0b4e3ff8c2f53c0c01ab7b 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -48,7 +48,6 @@
 #include "address.h"
 #include "alias.h"
 #include "body.h"
-#include "mutt_charset.h"
 #include "envelope.h"
 #include "filter.h"
 #include "format_flags.h"
@@ -56,6 +55,7 @@
 #include "header.h"
 #include "mailbox.h"
 #include "mime.h"
+#include "mutt_charset.h"
 #include "mutt_curses.h"
 #include "mutt_regex.h"
 #include "tags.h"

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 8dafb98042610a593e0b8373181f614846c419d6..bf7933032c8f13603381f61b38d587a1d92d4482 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -50,7 +50,6 @@
 #include "address.h"
 #include "alias.h"
 #include "body.h"
-#include "mutt_charset.h"
 #include "crypt.h"
 #include "envelope.h"
 #include "format_flags.h"
@@ -58,6 +57,7 @@
 #include "header.h"
 #include "keymap.h"
 #include "mime.h"
+#include "mutt_charset.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "ncrypt.h"

diff --git a/ncrypt/gnupgparse.c b/ncrypt/gnupgparse.c
index b31c96fef60d1e47f04e86913e227da2a1545144..c18e1626e0d70800f2fea389d49896a319e533bf 100644 (file)
--- a/ncrypt/gnupgparse.c
+++ b/ncrypt/gnupgparse.c
@@ -40,10 +40,10 @@
 #include <unistd.h>
 #include "mutt/mutt.h"
 #include "mutt.h"
-#include "mutt_charset.h"
 #include "filter.h"
 #include "globals.h"
 #include "mime.h"
+#include "mutt_charset.h"
 #include "ncrypt.h"
 #include "options.h"
 #include "pgpinvoke.h"

diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 07ca99eae319afd46a8d5a73ba94d9711f61153c..08b874241c4db13491ca35383e9d1720f25bd3b6 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -47,13 +47,13 @@
 #include "mutt.h"
 #include "address.h"
 #include "body.h"
-#include "mutt_charset.h"
 #include "crypt.h"
 #include "cryptglue.h"
 #include "filter.h"
 #include "globals.h"
 #include "header.h"
 #include "mime.h"
+#include "mutt_charset.h"
 #include "mutt_curses.h"
 #include "mutt_regex.h"
 #include "ncrypt.h"

diff --git a/parse.c b/parse.c
index e856ef0ca841fbd7a063aaa438ad7ed9910ea4f2..4d83405dd43967332e133a58180987c12b00870d 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -32,12 +32,12 @@
 #include "mutt.h"
 #include "address.h"
 #include "body.h"
-#include "mutt_charset.h"
 #include "envelope.h"
 #include "globals.h"
 #include "header.h"
 #include "mailbox.h"
 #include "mime.h"
+#include "mutt_charset.h"
 #include "mutt_regex.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
@@ -387,10 +387,10 @@ void mutt_parse_content_type(char *s, struct Body *ct)
     pc = mutt_param_get("charset", ct->parameter);
     if (!pc)
       mutt_param_set("charset",
-                         (AssumedCharset && *AssumedCharset) ?
-                             (const char *) mutt_cs_get_default_charset() :
-                             "us-ascii",
-                         &ct->parameter);
+                     (AssumedCharset && *AssumedCharset) ?
+                         (const char *) mutt_cs_get_default_charset() :
+                         "us-ascii",
+                     &ct->parameter);
   }
 }
 

diff --git a/pop_auth.c b/pop_auth.c
index 5024685ab4002dab8a6f8c8390dacfbe8baf49bf..49ca5bb1a235e1ad7c9430ec71f75906659d64fd 100644 (file)
--- a/pop_auth.c
+++ b/pop_auth.c
@@ -296,8 +296,7 @@ static enum PopAuthRes pop_auth_user(struct PopData *pop_data, const char *metho
     snprintf(buf, sizeof(buf), "PASS %s\r\n", pop_data->conn->account.pass);
     ret = pop_query_d(pop_data, buf, sizeof(buf),
                       /* don't print the password unless we're at the ungodly debugging level */
-                      debuglevel < MUTT_SOCK_LOG_FULL ? "PASS *\r\n" :
-                                                        NULL);
+                      debuglevel < MUTT_SOCK_LOG_FULL ? "PASS *\r\n" : NULL);
   }
 
   switch (ret)

diff --git a/recvcmd.c b/recvcmd.c
index a782395cbe8dd9728ed08ba44b60c99ba1fe336b..372cc0bc6ce8627b747121b263e1fdf0547527cf 100644 (file)
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -341,7 +341,8 @@ static void include_header(int quote, FILE *ifp, struct Header *hdr, FILE *ofp,
     if (prefix)
       mutt_str_strfcpy(prefix2, prefix, sizeof(prefix2));
     else if (!option(OPT_TEXT_FLOWED))
-      mutt_make_string_flags(prefix2, sizeof(prefix2), NONULL(IndentString), Context, hdr, 0);
+      mutt_make_string_flags(prefix2, sizeof(prefix2), NONULL(IndentString),
+                             Context, hdr, 0);
     else
       mutt_str_strfcpy(prefix2, ">", sizeof(prefix2));
 

diff --git a/rfc2047.c b/rfc2047.c
index cd0727dac5f18898fdff7c3485975242fa2ca647..e7af709fb878f83c22ca58332b541d55060fc077 100644 (file)
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -29,10 +29,10 @@
 #include "mutt/mutt.h"
 #include "rfc2047.h"
 #include "address.h"
-#include "mutt_charset.h"
 #include "globals.h"
 #include "mbyte.h"
 #include "mime.h"
+#include "mutt_charset.h"
 #include "options.h"
 #include "protos.h"
 

diff --git a/rfc2231.c b/rfc2231.c
index eec51c71499a15c03045cb6aa77369b770050d4c..c59295f5bd7bac33650b420ed96dde0abeef01e7 100644 (file)
--- a/rfc2231.c
+++ b/rfc2231.c
@@ -36,10 +36,10 @@
 #include <string.h>
 #include "mutt/mutt.h"
 #include "rfc2231.h"
-#include "mutt_charset.h"
 #include "globals.h"
 #include "mbyte.h"
 #include "mime.h"
+#include "mutt_charset.h"
 #include "options.h"
 #include "parameter.h"
 #include "protos.h"

diff --git a/sendlib.c b/sendlib.c
index 916e4f3225468a00ef2e832101231ceb79c4b852..19a72b014546cc3ea70f84bbfb2f0b5484e1cd4c 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -43,7 +43,6 @@
 #include "address.h"
 #include "body.h"
 #include "buffy.h"
-#include "mutt_charset.h"
 #include "content.h"
 #include "context.h"
 #include "copy.h"
@@ -54,6 +53,7 @@
 #include "header.h"
 #include "mailbox.h"
 #include "mime.h"
+#include "mutt_charset.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "mx.h"
@@ -968,10 +968,10 @@ struct Content *mutt_get_content_info(const char *fname, struct Body *b)
   mutt_file_fclose(&fp);
 
   if (b != NULL && b->type == TYPETEXT && (!b->noconv && !b->force_charset))
-    mutt_param_set(
-        "charset",
-        (!info->hibin ? "us-ascii" : Charset && !mutt_cs_is_us_ascii(Charset) ? Charset : "unknown-8bit"),
-        &b->parameter);
+    mutt_param_set("charset",
+                   (!info->hibin ? "us-ascii" :
+                                   Charset && !mutt_cs_is_us_ascii(Charset) ? Charset : "unknown-8bit"),
+                   &b->parameter);
 
   return info;
 }