From 6e1aae8775a1f240515b7a34fea883ff58af61f3 Mon Sep 17 00:00:00 2001 From: Richard Russon Date: Fri, 8 Dec 2017 16:37:39 +0000 Subject: [PATCH] clang-format --- alias.c | 2 +- browser.c | 2 +- handler.c | 2 +- hcache/hcache.c | 2 +- history.c | 2 +- imap/auth_gss.c | 2 +- imap/utf7.c | 2 +- init.c | 8 +++++--- mutt_idna.c | 2 +- mutt_notmuch.c | 8 ++++---- muttlib.c | 2 +- ncrypt/crypt_gpgme.c | 2 +- ncrypt/gnupgparse.c | 2 +- ncrypt/pgp.c | 2 +- parse.c | 10 +++++----- pop_auth.c | 3 +-- recvcmd.c | 3 ++- rfc2047.c | 2 +- rfc2231.c | 2 +- sendlib.c | 10 +++++----- 20 files changed, 36 insertions(+), 34 deletions(-) diff --git a/alias.c b/alias.c index 729ee0e68..d028ec85b 100644 --- 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 9dde941a3..e261086d7 100644 --- 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 694a5617d..737e8a9ee 100644 --- 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 c5bb942dc..9d5ded3df 100644 --- 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 0f5921ac9..262bd24ad 100644 --- a/history.c +++ b/history.c @@ -28,8 +28,8 @@ #include #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 461790d2d..40adcfae1 100644 --- 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 abfcaf1d8..a3ef996a0 100644 --- a/imap/utf7.c +++ b/imap/utf7.c @@ -35,8 +35,8 @@ #include #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 d9d7ccea0..1a0fda642 100644 --- 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 d9dbb6af8..cf05b3978 100644 --- 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 3cdc8c37f..ad8950d5a 100644 --- a/mutt_notmuch.c +++ b/mutt_notmuch.c @@ -68,11 +68,11 @@ #endif /* @def The definition in 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 84292201a..a7e3f79fd 100644 --- 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 8dafb9804..bf7933032 100644 --- 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 b31c96fef..c18e1626e 100644 --- a/ncrypt/gnupgparse.c +++ b/ncrypt/gnupgparse.c @@ -40,10 +40,10 @@ #include #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 07ca99eae..08b874241 100644 --- 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 e856ef0ca..4d83405dd 100644 --- 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 5024685ab..49ca5bb1a 100644 --- 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 a782395cb..372cc0bc6 100644 --- 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 cd0727dac..e7af709fb 100644 --- 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 eec51c714..c59295f5b 100644 --- a/rfc2231.c +++ b/rfc2231.c @@ -36,10 +36,10 @@ #include #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 916e4f322..19a72b014 100644 --- 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; } -- 2.40.0