From 43258eda2074891d574c292a008207de0c7455bb Mon Sep 17 00:00:00 2001 From: Richard Russon Date: Fri, 7 Jul 2017 17:49:19 +0100 Subject: [PATCH] clang-format --- browser.c | 4 ++-- commands.c | 4 ++-- compose.c | 19 ++++++++++++------- curs_lib.c | 2 +- curs_main.c | 2 +- enter.c | 5 +++-- filter.c | 2 +- handler.c | 24 ++++++++++++------------ help.c | 3 +-- hook.c | 9 +++++---- init.c | 38 +++++++++++++++++--------------------- keymap.c | 12 +++++++++--- main.c | 3 ++- md5.c | 2 +- mutt_lua.c | 2 +- mutt_notmuch.c | 8 ++++---- mutt_socket.c | 8 ++++---- mutt_ssl.c | 3 ++- ncrypt/crypt_gpgme.c | 5 +++-- nntp.c | 2 +- pager.c | 13 ++++++------- parse.c | 9 +++++---- recvattach.c | 5 +++-- 23 files changed, 98 insertions(+), 86 deletions(-) diff --git a/browser.c b/browser.c index 92c5c42ab..dfeb117ef 100644 --- a/browser.c +++ b/browser.c @@ -1248,7 +1248,7 @@ void _mutt_select_file(char *f, size_t flen, int flags, char ***files, int *numf #endif if (buffy) { - examine_mailboxes (NULL, &state); + examine_mailboxes(NULL, &state); } else #ifdef USE_IMAP @@ -1808,7 +1808,7 @@ void _mutt_select_file(char *f, size_t flen, int flags, char ***files, int *numf if (buffy) { - examine_mailboxes (menu, &state); + examine_mailboxes(menu, &state); } #ifdef USE_IMAP else if (mx_is_imap(LastDir)) diff --git a/commands.c b/commands.c index bd740b736..5fbc09340 100644 --- a/commands.c +++ b/commands.c @@ -508,8 +508,8 @@ void mutt_print_message(struct Header *h) return; } - if (query_quadoption(OPT_PRINT, h ? _("Print message?") : - _("Print tagged messages?")) != MUTT_YES) + if (query_quadoption(OPT_PRINT, + h ? _("Print message?") : _("Print tagged messages?")) != MUTT_YES) return; if (_mutt_pipe_message(h, PrintCmd, option(OPTPRINTDECODE), 1, diff --git a/compose.c b/compose.c index e868c0c55..c4129a963 100644 --- a/compose.c +++ b/compose.c @@ -403,13 +403,16 @@ static void draw_envelope(struct Header *msg, char *fcc) } else { - mutt_window_mvprintw(MuttIndexWindow, HDR_TO, 0, "%*s", HeaderPadding[HDR_NEWSGROUPS], Prompts[HDR_NEWSGROUPS]); + mutt_window_mvprintw(MuttIndexWindow, HDR_TO, 0, "%*s", + HeaderPadding[HDR_NEWSGROUPS], Prompts[HDR_NEWSGROUPS]); mutt_paddstr(W, NONULL(msg->env->newsgroups)); - mutt_window_mvprintw(MuttIndexWindow, HDR_CC, 0, "%*s", HeaderPadding[HDR_FOLLOWUPTO], Prompts[HDR_FOLLOWUPTO]); + mutt_window_mvprintw(MuttIndexWindow, HDR_CC, 0, "%*s", + HeaderPadding[HDR_FOLLOWUPTO], Prompts[HDR_FOLLOWUPTO]); mutt_paddstr(W, NONULL(msg->env->followup_to)); if (option(OPTXCOMMENTTO)) { - mutt_window_mvprintw(MuttIndexWindow, HDR_BCC, 0, "%*s", HeaderPadding[HDR_XCOMMENTTO], Prompts[HDR_XCOMMENTTO]); + mutt_window_mvprintw(MuttIndexWindow, HDR_BCC, 0, "%*s", + HeaderPadding[HDR_XCOMMENTTO], Prompts[HDR_XCOMMENTTO]); mutt_paddstr(W, NONULL(msg->env->x_comment_to)); } } @@ -1187,9 +1190,10 @@ int mutt_compose_menu(struct Header *msg, /* structure for new message */ case OP_COMPOSE_EDIT_DESCRIPTION: CHECK_COUNT; - strfcpy(buf, idx[menu->current]->content->description ? - idx[menu->current]->content->description : - "", + strfcpy(buf, + idx[menu->current]->content->description ? + idx[menu->current]->content->description : + "", sizeof(buf)); /* header names should not be translated */ if (mutt_get_field("Description: ", buf, sizeof(buf), 0) == 0) @@ -1576,7 +1580,8 @@ int mutt_compose_menu(struct Header *msg, /* structure for new message */ { 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/curs_lib.c b/curs_lib.c index f6ca4de6f..73f443c8c 100644 --- a/curs_lib.c +++ b/curs_lib.c @@ -905,7 +905,7 @@ int _mutt_enter_fname(const char *prompt, char *buf, size_t blen, int buffy, flags |= MUTT_SEL_MULTI; if (buffy) flags |= MUTT_SEL_BUFFY; - _mutt_select_file (buf, blen, flags, files, numfiles); + _mutt_select_file(buf, blen, flags, files, numfiles); } else { diff --git a/curs_main.c b/curs_main.c index 9c2fb3a41..e916c03e4 100644 --- a/curs_main.c +++ b/curs_main.c @@ -134,7 +134,7 @@ static const char *No_visible = N_("No visible messages."); #define CURHDR Context->hdrs[Context->v2r[menu->current]] #define UNREAD(h) mutt_thread_contains_unread(Context, h) -#define FLAGGED(h) mutt_thread_contains_flagged (Context, h) +#define FLAGGED(h) mutt_thread_contains_flagged(Context, h) #define CAN_COLLAPSE(header) \ ((option(OPTCOLLAPSEUNREAD) || !UNREAD(header)) && \ diff --git a/enter.c b/enter.c index 17d3b40cb..ccbd1d233 100644 --- a/enter.c +++ b/enter.c @@ -671,8 +671,9 @@ int _mutt_enter_string(char *buf, size_t buflen, int col, int flags, int multipl (tempbuf && templen == state->lastchar && !memcmp(tempbuf, state->wbuf, state->lastchar * sizeof(wchar_t)))) { - _mutt_select_file(buf, buflen, ((flags & MUTT_EFILE) ? MUTT_SEL_FOLDER : 0) | - (multiple ? MUTT_SEL_MULTI : 0), + _mutt_select_file(buf, buflen, + ((flags & MUTT_EFILE) ? MUTT_SEL_FOLDER : 0) | + (multiple ? MUTT_SEL_MULTI : 0), files, numfiles); if (*buf) { diff --git a/filter.c b/filter.c index a3fec3b72..0354310a9 100644 --- a/filter.c +++ b/filter.c @@ -19,8 +19,8 @@ #include #include #include -#include "filter.h" #include "mutt.h" +#include "filter.h" #include "mutt_curses.h" #include "protos.h" diff --git a/handler.c b/handler.c index ea54619b1..90ab82a4d 100644 --- a/handler.c +++ b/handler.c @@ -1087,7 +1087,7 @@ static int alternative_handler(struct Body *a, struct State *s) { char *c = NULL; int btlen; /* length of basetype */ - bool wild; /* do we have a wildcard to match all subtypes? */ + bool wild; /* do we have a wildcard to match all subtypes? */ c = strchr(t->data, '/'); if (c) @@ -1624,23 +1624,23 @@ void mutt_decode_attachment(struct Body *b, struct State *s) switch (b->encoding) { case ENCQUOTEDPRINTABLE: - decode_quoted(s, b->length, istext || ((WithCrypto & APPLICATION_PGP) && - mutt_is_application_pgp(b)), - cd); + decode_quoted( + s, b->length, + istext || ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp(b)), cd); break; case ENCBASE64: - mutt_decode_base64(s, b->length, istext || ((WithCrypto & APPLICATION_PGP) && - mutt_is_application_pgp(b)), - cd); + mutt_decode_base64( + s, b->length, + istext || ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp(b)), cd); break; case ENCUUENCODED: - decode_uuencoded(s, b->length, istext || ((WithCrypto & APPLICATION_PGP) && - mutt_is_application_pgp(b)), - cd); + decode_uuencoded( + s, b->length, + istext || ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp(b)), cd); break; default: - decode_xbit(s, b->length, istext || ((WithCrypto & APPLICATION_PGP) && - mutt_is_application_pgp(b)), + decode_xbit(s, b->length, + istext || ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp(b)), cd); break; } diff --git a/help.c b/help.c index 005232cd9..3710adc69 100644 --- a/help.c +++ b/help.c @@ -372,7 +372,6 @@ void mutt_help(int menu) safe_fclose(&f); snprintf(buf, sizeof(buf), _("Help for %s"), desc); - } while (mutt_do_pager(buf, t, MUTT_PAGER_RETWINCH | MUTT_PAGER_MARKER | - MUTT_PAGER_NSKIP | MUTT_PAGER_NOWRAP, + } while (mutt_do_pager(buf, t, MUTT_PAGER_RETWINCH | MUTT_PAGER_MARKER | MUTT_PAGER_NSKIP | MUTT_PAGER_NOWRAP, NULL) == OP_REFORMAT_WINCH); } diff --git a/hook.c b/hook.c index 4477e903d..529780af6 100644 --- a/hook.c +++ b/hook.c @@ -87,10 +87,11 @@ int mutt_parse_hook(struct Buffer *buf, struct Buffer *s, unsigned long data, } } - mutt_extract_token(&command, s, (data & (MUTT_FOLDERHOOK | MUTT_SENDHOOK | MUTT_SEND2HOOK | - MUTT_ACCOUNTHOOK | MUTT_REPLYHOOK)) ? - MUTT_TOKEN_SPACE : - 0); + mutt_extract_token(&command, s, + (data & (MUTT_FOLDERHOOK | MUTT_SENDHOOK | MUTT_SEND2HOOK | + MUTT_ACCOUNTHOOK | MUTT_REPLYHOOK)) ? + MUTT_TOKEN_SPACE : + 0); if (!command.data) { diff --git a/init.c b/init.c index b6514ff55..c5fabfda9 100644 --- a/init.c +++ b/init.c @@ -374,7 +374,7 @@ int mutt_option_set(const struct Option *val, struct Buffer *err) err2.dsize = sizeof(err_str); struct Buffer tmp; - tmp.data = (char *)val->data; + tmp.data = (char *) val->data; tmp.dsize = strlen((char *) val->data); if (parse_regex(idx, &tmp, &err2)) @@ -401,8 +401,7 @@ int mutt_option_set(const struct Option *val, struct Buffer *err) } else { - snprintf(err->data, err->dsize, _("%s: Unknown type."), - MuttVars[idx].option); + snprintf(err->data, err->dsize, _("%s: Unknown type."), MuttVars[idx].option); return -1; } break; @@ -436,13 +435,11 @@ int mutt_option_set(const struct Option *val, struct Buffer *err) if (!map) { - snprintf(err->data, err->dsize, _("%s: Unknown type."), - MuttVars[idx].option); + snprintf(err->data, err->dsize, _("%s: Unknown type."), MuttVars[idx].option); return -1; } - if (parse_sort((short *) MuttVars[idx].data, (const char *) val->data, - map, err) == -1) + if (parse_sort((short *) MuttVars[idx].data, (const char *) val->data, map, err) == -1) { return -1; } @@ -2191,8 +2188,8 @@ static void start_debug(void) snprintf(debugfilename, sizeof(debugfilename), "%s%d", DebugFile, i); snprintf(buf, sizeof(buf), "%s%d", DebugFile, i + 1); - mutt_expand_path (debugfilename, sizeof (debugfilename)); - mutt_expand_path (buf, sizeof (buf)); + mutt_expand_path(debugfilename, sizeof(debugfilename)); + mutt_expand_path(buf, sizeof(buf)); rename(debugfilename, buf); } @@ -2439,7 +2436,8 @@ static int parse_set(struct Buffer *tmp, struct Buffer *s, unsigned long data, { if (query || unset || inv) { - snprintf(err->data, err->dsize, "%s", _("prefix is illegal with reset")); + snprintf(err->data, err->dsize, "%s", + _("prefix is illegal with reset")); return -1; } @@ -2453,7 +2451,8 @@ static int parse_set(struct Buffer *tmp, struct Buffer *s, unsigned long data, { if (CurrentMenu == MENU_PAGER) { - snprintf(err->data, err->dsize, "%s", _("Not available in this menu.")); + snprintf(err->data, err->dsize, "%s", + _("Not available in this menu.")); return -1; } for (idx = 0; MuttVars[idx].option; idx++) @@ -2480,7 +2479,8 @@ static int parse_set(struct Buffer *tmp, struct Buffer *s, unsigned long data, { if (unset || inv || query) { - snprintf(err->data, err->dsize, "%s", _("Usage: set variable=yes|no")); + snprintf(err->data, err->dsize, "%s", + _("Usage: set variable=yes|no")); return -1; } @@ -2492,7 +2492,8 @@ static int parse_set(struct Buffer *tmp, struct Buffer *s, unsigned long data, unset = 1; else { - snprintf(err->data, err->dsize, "%s", _("Usage: set variable=yes|no")); + snprintf(err->data, err->dsize, "%s", + _("Usage: set variable=yes|no")); return -1; } } @@ -3902,11 +3903,7 @@ static int execute_commands(struct List *p) static char *find_cfg(const char *home, const char *xdg_cfg_home) { const char *names[] = { - "neomuttrc-" PACKAGE_VERSION, - "neomuttrc", - "muttrc-" MUTT_VERSION, - "muttrc", - NULL, + "neomuttrc-" PACKAGE_VERSION, "neomuttrc", "muttrc-" MUTT_VERSION, "muttrc", NULL, }; const char *locations[][2] = { @@ -3955,8 +3952,7 @@ void mutt_init(int skip_sys_rc, struct List *commands) Groups = hash_create(1031, 0); /* reverse alias keys need to be strdup'ed because of idna conversions */ - ReverseAlias = hash_create(1031, MUTT_HASH_STRCASECMP | MUTT_HASH_STRDUP_KEYS | - MUTT_HASH_ALLOW_DUPS); + ReverseAlias = hash_create(1031, MUTT_HASH_STRCASECMP | MUTT_HASH_STRDUP_KEYS | MUTT_HASH_ALLOW_DUPS); #ifdef USE_NOTMUCH TagTransforms = hash_create(64, 1); TagFormats = hash_create(64, 0); @@ -4017,7 +4013,7 @@ void mutt_init(int skip_sys_rc, struct List *commands) { int i = mutt_option_index("debug_file"); if ((i >= 0) && (MuttVars[i].init != 0)) - DebugFile = safe_strdup((const char*) MuttVars[i].init); + DebugFile = safe_strdup((const char *) MuttVars[i].init); } start_debug(); } diff --git a/keymap.c b/keymap.c index 6e4c642a0..8024d0bf1 100644 --- a/keymap.c +++ b/keymap.c @@ -267,13 +267,19 @@ int km_bind_err(char *s, int menu, int op, char *macro, char *descr, struct Buff if (err) { /* err was passed, put the string there */ - snprintf(err->data, err->dsize, _("Binding '%s' will alias '%s' Before, try: 'bind %s %s noop' https://neomutt.org/guide/configuration.html#bind-warnings"), - old_binding, new_binding, mutt_getnamebyvalue(menu, Menus), new_binding); + snprintf( + err->data, err->dsize, + _("Binding '%s' will alias '%s' Before, try: 'bind %s %s " + "noop' " + "https://neomutt.org/guide/configuration.html#bind-warnings"), + old_binding, new_binding, mutt_getnamebyvalue(menu, Menus), new_binding); } else { mutt_error( - _("Binding '%s' will alias '%s' Before, try: 'bind %s %s noop' https://neomutt.org/guide/configuration.html#bind-warnings"), + _("Binding '%s' will alias '%s' Before, try: 'bind %s %s " + "noop' " + "https://neomutt.org/guide/configuration.html#bind-warnings"), old_binding, new_binding, mutt_getnamebyvalue(menu, Menus), new_binding); } retval = -2; diff --git a/main.c b/main.c index d3e4d0c84..a0d6a99de 100644 --- a/main.c +++ b/main.c @@ -315,7 +315,8 @@ int main(int argc, char **argv, char **env) } printf(_("Debugging at level %d.\n"), debuglevel_cmdline); #else - printf("%s", _("DEBUG was not defined during compilation. -d Ignored.\n")); + printf("%s", + _("DEBUG was not defined during compilation. -d Ignored.\n")); #endif break; diff --git a/md5.c b/md5.c index b2a4258a9..45b77ecb2 100644 --- a/md5.c +++ b/md5.c @@ -24,8 +24,8 @@ /* Written by Ulrich Drepper , 1995. */ #include "config.h" -#include #include +#include #include #include "md5.h" diff --git a/mutt_lua.c b/mutt_lua.c index 698be2ad4..866368f66 100644 --- a/mutt_lua.c +++ b/mutt_lua.c @@ -146,7 +146,7 @@ static int _lua_mutt_set(lua_State *l) luaL_error(l, "Invalid opt for quad option %s (one of " "mutt.QUAD_YES, mutt.QUAD_NO, mutt.QUAD_ASKYES, " "mutt.QUAD_ASKNO", - param); + param); rv = -1; } else diff --git a/mutt_notmuch.c b/mutt_notmuch.c index c2a2d83dd..d8713a2b4 100644 --- a/mutt_notmuch.c +++ b/mutt_notmuch.c @@ -651,12 +651,12 @@ static notmuch_database_t *do_database_open(const char *filename, int writable, do { #ifdef NOTMUCH_API_3 - st = notmuch_database_open(filename, writable ? NOTMUCH_DATABASE_MODE_READ_WRITE : - NOTMUCH_DATABASE_MODE_READ_ONLY, + st = notmuch_database_open(filename, writable ? NOTMUCH_DATABASE_MODE_READ_WRITE : NOTMUCH_DATABASE_MODE_READ_ONLY, &db); #else - db = notmuch_database_open(filename, writable ? NOTMUCH_DATABASE_MODE_READ_WRITE : - NOTMUCH_DATABASE_MODE_READ_ONLY); + db = notmuch_database_open(filename, + writable ? NOTMUCH_DATABASE_MODE_READ_WRITE : + NOTMUCH_DATABASE_MODE_READ_ONLY); #endif if (db || !NotmuchOpenTimeout || ((ct / 2) > NotmuchOpenTimeout)) break; diff --git a/mutt_socket.c b/mutt_socket.c index 19ef47c4b..6ad4d8c2c 100644 --- a/mutt_socket.c +++ b/mutt_socket.c @@ -405,9 +405,9 @@ static int socket_connect(int fd, struct sockaddr *sa) /* FreeBSD's connect() does not respect SA_RESTART, meaning * a SIGWINCH will cause the connect to fail. */ - sigemptyset (&set); - sigaddset (&set, SIGWINCH); - sigprocmask (SIG_BLOCK, &set, NULL); + sigemptyset(&set); + sigaddset(&set, SIGWINCH); + sigprocmask(SIG_BLOCK, &set, NULL); save_errno = 0; @@ -421,7 +421,7 @@ static int socket_connect(int fd, struct sockaddr *sa) if (ConnectTimeout > 0) alarm(0); mutt_allow_interrupt(0); - sigprocmask (SIG_UNBLOCK, &set, NULL); + sigprocmask(SIG_UNBLOCK, &set, NULL); return save_errno; } diff --git a/mutt_ssl.c b/mutt_ssl.c index b4bedaf4d..cb19b13b9 100644 --- a/mutt_ssl.c +++ b/mutt_ssl.c @@ -808,7 +808,8 @@ static int interactive_check_cert(X509 *cert, int idx, int len, SSL *ssl, int al x509_get_part(x509_issuer, part[u])); row++; - snprintf(menu->dialog[row++], SHORT_STRING, "%s", _("This certificate is valid")); + snprintf(menu->dialog[row++], SHORT_STRING, "%s", + _("This certificate is valid")); snprintf(menu->dialog[row++], SHORT_STRING, _(" from %s"), asn1time_to_string(X509_get_notBefore(cert))); snprintf(menu->dialog[row++], SHORT_STRING, _(" to %s"), diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c index d4a7564e7..9aede2c36 100644 --- a/ncrypt/crypt_gpgme.c +++ b/ncrypt/crypt_gpgme.c @@ -943,8 +943,9 @@ static struct Body *sign_message(struct Body *a, int use_smime) t->disposition = DISPINLINE; mutt_generate_boundary(&t->parameter); - mutt_set_parameter("protocol", use_smime ? "application/pkcs7-signature" : - "application/pgp-signature", + mutt_set_parameter("protocol", + use_smime ? "application/pkcs7-signature" : + "application/pgp-signature", &t->parameter); /* Get the micalg from gpgme. Old gpgme versions don't support this for S/MIME so we assume sha-1 in this case. */ diff --git a/nntp.c b/nntp.c index 7d8afbea1..028052dd1 100644 --- a/nntp.c +++ b/nntp.c @@ -740,7 +740,7 @@ int nntp_open_connection(struct NntpServer *nserv) static int nntp_query(struct NntpData *nntp_data, char *line, size_t linelen) { struct NntpServer *nserv = nntp_data->nserv; - char buf[LONG_STRING] = {0}; + char buf[LONG_STRING] = { 0 }; if (nserv->status == NNTP_BYE) return -1; diff --git a/pager.c b/pager.c index 756f4e79f..87b60063f 100644 --- a/pager.c +++ b/pager.c @@ -2455,9 +2455,8 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e rd.SearchCompiled = 1; /* update the search pointers */ i = 0; - while (display_line(rd.fp, &rd.last_pos, &rd.lineInfo, i, &rd.lastLine, - &rd.maxLine, MUTT_SEARCH | (flags & MUTT_PAGER_NSKIP) | - (flags & MUTT_PAGER_NOWRAP), + while (display_line(rd.fp, &rd.last_pos, &rd.lineInfo, i, &rd.lastLine, &rd.maxLine, + MUTT_SEARCH | (flags & MUTT_PAGER_NSKIP) | (flags & MUTT_PAGER_NOWRAP), &rd.QuoteList, &rd.q_level, &rd.force_redraw, &rd.SearchRE, rd.pager_window) == 0) i++; @@ -2955,10 +2954,10 @@ int mutt_pager(const char *banner, const char *fname, int flags, struct Pager *e break; } CHECK_MODE(IsHeader(extra)); - if (mutt_save_message(extra->hdr, (ch == OP_DECRYPT_SAVE) || (ch == OP_SAVE) || - (ch == OP_DECODE_SAVE), - (ch == OP_DECODE_SAVE) || (ch == OP_DECODE_COPY), - (ch == OP_DECRYPT_SAVE) || (ch == OP_DECRYPT_COPY) || 0) == 0 && + if (mutt_save_message( + extra->hdr, (ch == OP_DECRYPT_SAVE) || (ch == OP_SAVE) || (ch == OP_DECODE_SAVE), + (ch == OP_DECODE_SAVE) || (ch == OP_DECODE_COPY), + (ch == OP_DECRYPT_SAVE) || (ch == OP_DECRYPT_COPY) || 0) == 0 && (ch == OP_SAVE || ch == OP_DECODE_SAVE || ch == OP_DECRYPT_SAVE)) { if (option(OPTRESOLVE)) diff --git a/parse.c b/parse.c index 973117288..e754940f9 100644 --- a/parse.c +++ b/parse.c @@ -382,9 +382,10 @@ void mutt_parse_content_type(char *s, struct Body *ct) if (ct->type == TYPETEXT) { if (!(pc = mutt_get_parameter("charset", ct->parameter))) - mutt_set_parameter("charset", (AssumedCharset && *AssumedCharset) ? - (const char *) mutt_get_default_charset() : - "us-ascii", + mutt_set_parameter("charset", + (AssumedCharset && *AssumedCharset) ? + (const char *) mutt_get_default_charset() : + "us-ascii", &ct->parameter); } } @@ -1253,7 +1254,7 @@ int mutt_parse_rfc822_line(struct Envelope *e, struct Header *hdr, char *line, hdr->replied = true; break; case 'O': - hdr->old = option(OPTMARKOLD) ? true: false; + hdr->old = option(OPTMARKOLD) ? true : false; break; case 'R': hdr->read = true; diff --git a/recvattach.c b/recvattach.c index f73a13243..b6f6e2527 100644 --- a/recvattach.c +++ b/recvattach.c @@ -781,8 +781,9 @@ void mutt_print_attachment_list(FILE *fp, int tag, struct Body *top) struct State state; pid_t thepid; - if (query_quadoption(OPT_PRINT, tag ? _("Print tagged attachment(s)?") : - _("Print attachment?")) != MUTT_YES) + if (query_quadoption(OPT_PRINT, + tag ? _("Print tagged attachment(s)?") : + _("Print attachment?")) != MUTT_YES) return; if (!option(OPTATTACHSPLIT)) -- 2.40.0