transform_to_7bit (a->parts, fpin);
}
- else if (mutt_is_message_type (a->type, a->subtype)) {
+ else if (mutt_is_message_type(a)) {
mutt_message_to_7bit (a, fpin);
}
else {
int mutt_bounce_message (FILE * fp, HEADER * h, address_t * to)
{
address_t *from;
- const char *fqdn = mutt_fqdn (1);
char resent_from[STRING];
int ret;
char *err;
resent_from[0] = '\0';
from = mutt_default_from ();
- if (fqdn)
- rfc822_qualify (from, fqdn);
+ rfc822_qualify(from, mutt_fqdn(1));
rfc2047_encode_adrlist (from, "Resent-From");
if (mutt_addrlist_to_idna (from, &err)) {
/* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header()
* post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header()
* */
- mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0,
- 0);
+ mutt_write_rfc822_header(msg->fp, hdr->env, hdr->content, -post, 0);
/* (postponment) if this was a reply of some sort, <msgid> contians the
* Message-ID: of message replied to. Save it using a special X-Mutt-
fprintf (msg->fp, "X-Mutt-Fcc: %s\n", fcc);
fprintf (msg->fp, "Status: RO\n");
-
-
/* (postponment) if the mail is to be signed or encrypted, save this info */
if (post && (hdr->security & APPLICATION_PGP)) {
fputs ("X-Mutt-PGP: ", msg->fp);
/* if there was an error, leave the temp version */
if (!r)
unlink (tempfile);
- }
- else {
+ } else {
fputc ('\n', msg->fp); /* finish off the header */
r = mutt_write_mime_body (hdr->content, msg->fp);
}