diff options
author | Kevin McCarthy <kevin@8t8.us> | 2019-01-03 19:58:18 -0800 |
---|---|---|
committer | Kevin McCarthy <kevin@8t8.us> | 2019-01-04 13:59:27 -0800 |
commit | 248c2ee8ed7c0ff333ae076041107210c5acd641 (patch) | |
tree | f51f10f1f486e08c76e187c095e536620bebbbd0 /copy.c | |
parent | 085a6f74b3b7cebabb75f4c99ea9d59649c7b03a (diff) |
Clean up code indentation.
These are mostly automated changes corresponding to the emacs
settings:
(c-set-style "linux")
(setq c-basic-offset 2)
(c-set-offset 'case-label '+)
Most of the code follows the convention:
(add-to-list 'c-cleanup-list 'space-before-funcall)
but this is not enforced by this indentation cleanup.
Also, I personally dislike tabs, so I have:
(setq-default indent-tabs-mode nil)
in my own configuration. However I have no desire to change every line
just for that effect. So this cleanup does nothing about the mix issue.
Some of the secondary files (e.g. regex.c) have been skipped.
I've also skipped crypt-gpgme.c, because I need to think about that
file. Werner Koch and the GnuPG team contributed most it, and it
follows the Gnu indentation settings. It should probably be made
uniform with Mutt, but I don't want to discourage future GnuPG
contribution to the file.
I manually reverted a few unsightly cleanups, and added a few tweeks
when I saw things that could be improved.
Diffstat (limited to 'copy.c')
-rw-r--r-- | copy.c | 52 |
1 files changed, 26 insertions, 26 deletions
@@ -88,8 +88,8 @@ mutt_copy_hdr (FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end, int flags, from = 1; } else if (flags & (CH_NOQFROM) && - ascii_strncasecmp (">From ", buf, 6) == 0) - continue; + ascii_strncasecmp (">From ", buf, 6) == 0) + continue; else if (buf[0] == '\n' || (buf[0] == '\r' && buf[1] == '\n')) break; /* end of header */ @@ -325,29 +325,29 @@ mutt_copy_hdr (FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end, int flags, return (0); } -/* flags - CH_DECODE RFC2047 header decoding - CH_FROM retain the "From " message separator - CH_FORCE_FROM give CH_FROM precedence over CH_WEED - CH_MIME ignore MIME fields - CH_NOLEN don't write Content-Length: and Lines: - CH_NONEWLINE don't output a newline after the header - CH_NOSTATUS ignore the Status: and X-Status: - CH_PREFIX quote header with $indent_str - CH_REORDER output header in order specified by `hdr_order' - CH_TXTPLAIN generate text/plain MIME headers [hack alert.] - CH_UPDATE write new Status: and X-Status: - CH_UPDATE_LEN write new Content-Length: and Lines: - CH_XMIT ignore Lines: and Content-Length: - CH_WEED do header weeding - CH_NOQFROM ignore ">From " line - CH_UPDATE_IRT update the In-Reply-To: header - CH_UPDATE_REFS update the References: header - CH_UPDATE_LABEL update the X-Label: header - - prefix - string to use if CH_PREFIX is set - */ +/* flags: + CH_DECODE RFC2047 header decoding + CH_FROM retain the "From " message separator + CH_FORCE_FROM give CH_FROM precedence over CH_WEED + CH_MIME ignore MIME fields + CH_NOLEN don't write Content-Length: and Lines: + CH_NONEWLINE don't output a newline after the header + CH_NOSTATUS ignore the Status: and X-Status: + CH_PREFIX quote header with $indent_str + CH_REORDER output header in order specified by `hdr_order' + CH_TXTPLAIN generate text/plain MIME headers [hack alert.] + CH_UPDATE write new Status: and X-Status: + CH_UPDATE_LEN write new Content-Length: and Lines: + CH_XMIT ignore Lines: and Content-Length: + CH_WEED do header weeding + CH_NOQFROM ignore ">From " line + CH_UPDATE_IRT update the In-Reply-To: header + CH_UPDATE_REFS update the References: header + CH_UPDATE_LABEL update the X-Label: header + + prefix: + string to use if CH_PREFIX is set +*/ int mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix) @@ -668,7 +668,7 @@ _mutt_copy_message (FILE *fpout, FILE *fpin, HEADER *hdr, BODY *body, if ((WithCrypto & APPLICATION_SMIME) && (flags & MUTT_CM_DECODE_SMIME) && (hdr->security & APPLICATION_SMIME) - && hdr->content->type == TYPEAPPLICATION) + && hdr->content->type == TYPEAPPLICATION) { if (crypt_smime_decrypt_mime (fpin, &fp, hdr->content, &cur)) return (-1); |