From: Kevin McCarthy Date: Sat, 5 Jan 2019 20:37:16 +0000 (-0800) Subject: Fix a few indenting issues. X-Git-Tag: mutt-1-12-rel~141 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=177f12acaf3c8b9864c707fbb01b95357544c2ca;p=mutt Fix a few indenting issues. These are mostly the result of making the formatting changes commit after the indent changes commit. --- diff --git a/attach.c b/attach.c index 6d53b015..9c2189d0 100644 --- a/attach.c +++ b/attach.c @@ -742,10 +742,10 @@ int mutt_save_attachment (FILE *fp, BODY *m, const char *path, int flags, HEADER /* recv mode */ if (hdr && - m->hdr && - m->encoding != ENCBASE64 && - m->encoding != ENCQUOTEDPRINTABLE && - mutt_is_message_type(m->type, m->subtype)) + m->hdr && + m->encoding != ENCBASE64 && + m->encoding != ENCQUOTEDPRINTABLE && + mutt_is_message_type(m->type, m->subtype)) { /* message type attachments are written to mail folders. */ diff --git a/browser.c b/browser.c index cf99a39f..cb30f829 100644 --- a/browser.c +++ b/browser.c @@ -231,14 +231,14 @@ folder_format_str (char *dest, size_t destlen, size_t col, int cols, char op, co snprintf (fn, sizeof (fn), "%s%s", s, folder->ff->local ? - (S_ISLNK (folder->ff->mode) ? - "@" : - (S_ISDIR (folder->ff->mode) ? - "/" : - ((folder->ff->mode & S_IXUSR) != 0 ? - "*" : - ""))) : - ""); + (S_ISLNK (folder->ff->mode) ? + "@" : + (S_ISDIR (folder->ff->mode) ? + "/" : + ((folder->ff->mode & S_IXUSR) != 0 ? + "*" : + ""))) : + ""); mutt_format_s (dest, destlen, fmt, fn); break; diff --git a/mime.h b/mime.h index dd8655f3..0a1ceca9 100644 --- a/mime.h +++ b/mime.h @@ -65,8 +65,8 @@ extern const char B64Chars[]; #define is_multipart(x) \ ((x)->type == TYPEMULTIPART \ - || ((x)->type == TYPEMESSAGE && (!strcasecmp((x)->subtype, "rfc822") \ - || !strcasecmp((x)->subtype, "news")))) + || ((x)->type == TYPEMESSAGE && (!strcasecmp((x)->subtype, "rfc822") \ + || !strcasecmp((x)->subtype, "news")))) extern const char *BodyTypes[]; extern const char *BodyEncodings[]; diff --git a/pager.c b/pager.c index c0a9fba4..fb821305 100644 --- a/pager.c +++ b/pager.c @@ -76,7 +76,7 @@ static HEADER *OldHdr = NULL; } #define CHECK_ATTACH \ - if (option(OPTATTACHMSG)) \ + if (option(OPTATTACHMSG)) \ { \ mutt_flushinp (); \ mutt_error _(Function_not_permitted_in_attach_message_mode); \ diff --git a/pgp.c b/pgp.c index cfccce4c..f3b7b495 100644 --- a/pgp.c +++ b/pgp.c @@ -825,8 +825,8 @@ int pgp_verify_one (BODY *sigbdy, STATE *s, const char *tempfile) crypt_current_time (s, "PGP"); if ((thepid = pgp_invoke_verify (NULL, &pgpout, NULL, - -1, -1, fileno(pgperr), - tempfile, sigfile)) != -1) + -1, -1, fileno(pgperr), + tempfile, sigfile)) != -1) { if (pgp_copy_checksig (pgpout, s->fpout) >= 0) badsig = 0;