From: Richard Russon Date: Mon, 10 Dec 2018 13:52:51 +0000 (+0000) Subject: clang-format X-Git-Tag: 2019-10-25~451 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79962fdb4d8d85350b48b9065c60589cb80853d0;p=neomutt clang-format --- diff --git a/hdrline.c b/hdrline.c index 93917f683..e9775f40f 100644 --- a/hdrline.c +++ b/hdrline.c @@ -69,13 +69,13 @@ enum FlagChars FLAG_CHAR_IMPORTANT, ///< Character denoting a important (flagged) email FLAG_CHAR_DELETED, ///< Character denoting a deleted email FLAG_CHAR_DELETED_ATTACH, ///< Character denoting a deleted attachment - FLAG_CHAR_REPLIED, ///< Character denoting an email that has been replied to - FLAG_CHAR_OLD, ///< Character denoting an email that has been read - FLAG_CHAR_NEW, ///< Character denoting an unread email - FLAG_CHAR_OLD_THREAD, ///< Character denoting a thread of emails that has been read - FLAG_CHAR_NEW_THREAD, ///< Character denoting a thread containing at least one new email - FLAG_CHAR_SEMPTY, ///< Character denoting a read email, $index_format %S expando - FLAG_CHAR_ZEMPTY, ///< Character denoting a read email, $index_format %Z expando + FLAG_CHAR_REPLIED, ///< Character denoting an email that has been replied to + FLAG_CHAR_OLD, ///< Character denoting an email that has been read + FLAG_CHAR_NEW, ///< Character denoting an unread email + FLAG_CHAR_OLD_THREAD, ///< Character denoting a thread of emails that has been read + FLAG_CHAR_NEW_THREAD, ///< Character denoting a thread containing at least one new email + FLAG_CHAR_SEMPTY, ///< Character denoting a read email, $index_format %S expando + FLAG_CHAR_ZEMPTY, ///< Character denoting a read email, $index_format %Z expando }; /** diff --git a/hook.c b/hook.c index d2922dd61..34d8e5e32 100644 --- a/hook.c +++ b/hook.c @@ -454,8 +454,7 @@ void mutt_message_hook(struct Mailbox *m, struct Email *e, int type) if (hook->type & type) { - if ((mutt_pattern_exec(hook->pattern, 0, m, e, &cache) > 0) ^ - hook->regex.not) + if ((mutt_pattern_exec(hook->pattern, 0, m, e, &cache) > 0) ^ hook->regex.not) { if (mutt_parse_rc_line(hook->command, &token, &err) == -1) { diff --git a/imap/imap.c b/imap/imap.c index 80cf8e90f..23ff9207e 100644 --- a/imap/imap.c +++ b/imap/imap.c @@ -782,7 +782,6 @@ void imap_expunge_mailbox(struct Mailbox *m) int cacheno; short old_sort; - #ifdef USE_HCACHE mdata->hcache = imap_hcache_open(adata, mdata); #endif diff --git a/maildir/maildir.c b/maildir/maildir.c index 9dfd3de43..20f388a96 100644 --- a/maildir/maildir.c +++ b/maildir/maildir.c @@ -64,7 +64,8 @@ * * Checks the specified maildir subdir (cur or new) for new mail or mail counts. */ -static void maildir_check_dir(struct Mailbox *m, const char *dir_name, bool check_new, bool check_stats) +static void maildir_check_dir(struct Mailbox *m, const char *dir_name, + bool check_new, bool check_stats) { DIR *dirp = NULL; struct dirent *de = NULL; diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c index 41761ec9a..eee39e3f5 100644 --- a/ncrypt/crypt_gpgme.c +++ b/ncrypt/crypt_gpgme.c @@ -3950,16 +3950,16 @@ static unsigned int key_check_cap(gpgme_key_t key, enum KeyCap cap) */ enum KeyInfo { - KIP_NAME = 0, ///< PGP Key field: Name - KIP_AKA, ///< PGP Key field: aka (Also Known As) - KIP_VALID_FROM, ///< PGP Key field: Valid From date - KIP_VALID_TO, ///< PGP Key field: Valid To date - KIP_KEY_TYPE, ///< PGP Key field: Key Type - KIP_KEY_USAGE, ///< PGP Key field: Key Usage - KIP_FINGERPRINT, ///< PGP Key field: Fingerprint - KIP_SERIAL_NO, ///< PGP Key field: Serial number - KIP_ISSUED_BY, ///< PGP Key field: Issued By - KIP_SUBKEY, ///< PGP Key field: Subkey + KIP_NAME = 0, ///< PGP Key field: Name + KIP_AKA, ///< PGP Key field: aka (Also Known As) + KIP_VALID_FROM, ///< PGP Key field: Valid From date + KIP_VALID_TO, ///< PGP Key field: Valid To date + KIP_KEY_TYPE, ///< PGP Key field: Key Type + KIP_KEY_USAGE, ///< PGP Key field: Key Usage + KIP_FINGERPRINT, ///< PGP Key field: Fingerprint + KIP_SERIAL_NO, ///< PGP Key field: Serial number + KIP_ISSUED_BY, ///< PGP Key field: Issued By + KIP_SUBKEY, ///< PGP Key field: Subkey KIP_MAX, }; diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c index a90c0ccac..46c7223a2 100644 --- a/notmuch/mutt_notmuch.c +++ b/notmuch/mutt_notmuch.c @@ -1710,15 +1710,14 @@ char *nm_uri_from_query(struct Mailbox *m, char *buf, size_t buflen) if (get_limit(mdata) != NmDbLimit) { - added = snprintf(uri, sizeof(uri), - "%s%s?type=%s&limit=%d&query=", NmUriProtocol, nm_db_get_filename(m), - query_type_to_string(mdata->query_type), get_limit(mdata)); + added = snprintf(uri, sizeof(uri), "%s%s?type=%s&limit=%d&query=", NmUriProtocol, + nm_db_get_filename(m), + query_type_to_string(mdata->query_type), get_limit(mdata)); } else { - added = snprintf(uri, sizeof(uri), - "%s%s?type=%s&query=", NmUriProtocol, nm_db_get_filename(m), - query_type_to_string(mdata->query_type)); + added = snprintf(uri, sizeof(uri), "%s%s?type=%s&query=", NmUriProtocol, + nm_db_get_filename(m), query_type_to_string(mdata->query_type)); } if (added >= sizeof(uri)) diff --git a/send.c b/send.c index a544ac543..10b9f18aa 100644 --- a/send.c +++ b/send.c @@ -1559,7 +1559,8 @@ int ci_send_message(int flags, struct Email *msg, char *tempfile, OptNewsSend = false; #endif - if (!flags && !msg && Recall != MUTT_NO && mutt_num_postponed(ctx ? ctx->mailbox: NULL, true)) + if (!flags && !msg && Recall != MUTT_NO && + mutt_num_postponed(ctx ? ctx->mailbox : NULL, true)) { /* If the user is composing a new message, check to see if there * are any postponed messages first.