From: Richard Russon <rich@flatcap.org>
Date: Sat, 23 Jun 2018 00:40:09 +0000 (+0100)
Subject: mutt_rfc822_write_header
X-Git-Tag: neomutt-20180716~23^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=615dd861e082db138b50776a58b200b3a981db0f;p=neomutt

mutt_rfc822_write_header
---

diff --git a/header.c b/header.c
index 6fd5b8976..2af55222a 100644
--- a/header.c
+++ b/header.c
@@ -59,7 +59,7 @@ void mutt_edit_headers(const char *editor, const char *body, struct Header *msg,
   }
 
   mutt_env_to_local(msg->env);
-  mutt_rfc822_write_header(ofp, msg->env, NULL, 1, 0);
+  mutt_rfc822_write_header(ofp, msg->env, NULL, 1, false);
   fputc('\n', ofp); /* tie off the header. */
 
   /* now copy the body of the message. */
diff --git a/main.c b/main.c
index 6bca861c2..eef4a3ed9 100644
--- a/main.c
+++ b/main.c
@@ -970,7 +970,7 @@ int main(int argc, char *argv[], char *envp[])
           mutt_env_to_intl(msg->env, NULL, NULL);
         }
 
-        mutt_rfc822_write_header(fout, msg->env, msg->content, -1, 0);
+        mutt_rfc822_write_header(fout, msg->env, msg->content, -1, false);
         if (ResumeEditedDraftFiles)
           fprintf(fout, "X-Mutt-Resume-Draft: 1\n");
         fputc('\n', fout);
diff --git a/protos.h b/protos.h
index c100591f0..b75bdf369 100644
--- a/protos.h
+++ b/protos.h
@@ -326,7 +326,7 @@ int mutt_write_mime_body(struct Body *a, FILE *f);
 int mutt_write_mime_header(struct Body *a, FILE *f);
 int mutt_write_one_header(FILE *fp, const char *tag, const char *value,
                           const char *pfx, int wraplen, int flags);
-int mutt_rfc822_write_header(FILE *fp, struct Envelope *env, struct Body *attach, int mode, int privacy);
+int mutt_rfc822_write_header(FILE *fp, struct Envelope *env, struct Body *attach, int mode, bool privacy);
 void mutt_write_references(const struct ListHead *r, FILE *f, size_t trim);
 int mutt_yesorno(const char *msg, int def);
 void mutt_set_header_color(struct Context *ctx, struct Header *curhdr);
diff --git a/send.c b/send.c
index cfe16e843..45cc8cdd7 100644
--- a/send.c
+++ b/send.c
@@ -1122,7 +1122,7 @@ static int send_message(struct Header *msg)
   mutt_rfc822_write_header(tempfp, msg->env, msg->content, 0, !STAILQ_EMPTY(&msg->chain));
 #endif
 #ifndef MIXMASTER
-  mutt_rfc822_write_header(tempfp, msg->env, msg->content, 0, 0);
+  mutt_rfc822_write_header(tempfp, msg->env, msg->content, 0, false);
 #endif
 #ifdef USE_SMTP
   if (old_write_bcc)
diff --git a/sendlib.c b/sendlib.c
index 44331808e..16d17001d 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -2099,12 +2099,12 @@ out:
  * mode == 0  => normal mode.  write full header + MIME headers
  * mode == -1 => write just the envelope info (used for postponing messages)
  *
- * privacy != 0 => will omit any headers which may identify the user.
+ * privacy true => will omit any headers which may identify the user.
  *               Output generated is suitable for being sent through
  *               anonymous remailer chains.
  */
 int mutt_rfc822_write_header(FILE *fp, struct Envelope *env,
-                             struct Body *attach, int mode, int privacy)
+                             struct Body *attach, int mode, bool privacy)
 {
   char buffer[LONG_STRING];
   char *p = NULL, *q = NULL;
@@ -3126,7 +3126,7 @@ int mutt_write_fcc(const char *path, struct Header *hdr, const char *msgid,
   /* post == 1 => postpone message. Set mode = -1 in mutt_rfc822_write_header()
    * post == 0 => Normal mode. Set mode = 0 in mutt_rfc822_write_header()
    * */
-  mutt_rfc822_write_header(msg->fp, hdr->env, hdr->content, post ? -post : 0, 0);
+  mutt_rfc822_write_header(msg->fp, hdr->env, hdr->content, post ? -post : 0, false);
 
   /* (postponement) if this was a reply of some sort, <msgid> contains the
    * Message-ID: of message replied to.  Save it using a special X-Mutt-