From: Richard Russon Date: Wed, 27 Feb 2019 00:53:51 +0000 (+0000) Subject: add typedef for CopyMessageFlags X-Git-Tag: 2019-10-25~347^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b97df2f52c2f9d5c03ead82e735756df1ec8bd49;p=neomutt add typedef for CopyMessageFlags --- diff --git a/commands.c b/commands.c index 22069fe5f..02e0bcef0 100644 --- a/commands.c +++ b/commands.c @@ -177,7 +177,7 @@ int mutt_display_message(struct Email *cur) char tempfile[PATH_MAX], buf[1024]; int rc = 0; bool builtin = false; - int cmflags = MUTT_CM_DECODE | MUTT_CM_DISPLAY | MUTT_CM_CHARCONV; + CopyMessageFlags cmflags = MUTT_CM_DECODE | MUTT_CM_DISPLAY | MUTT_CM_CHARCONV; CopyHeaderFlags chflags; FILE *fpout = NULL; FILE *fpfilterout = NULL; @@ -470,10 +470,11 @@ void ci_bounce_message(struct Mailbox *m, struct EmailList *el) * pipe_set_flags - Generate flags for copy header/message * @param[in] decode If true decode the message * @param[in] print If true, mark the message for printing - * @param[out] cmflags Copy message flags, e.g. MUTT_CM_DECODE + * @param[out] cmflags Flags, see #CopyMessageFlags * @param[out] chflags Flags, see #CopyHeaderFlags */ -static void pipe_set_flags(bool decode, bool print, int *cmflags, CopyHeaderFlags *chflags) +static void pipe_set_flags(bool decode, bool print, CopyMessageFlags *cmflags, + CopyHeaderFlags *chflags) { if (decode) { @@ -501,7 +502,7 @@ static void pipe_set_flags(bool decode, bool print, int *cmflags, CopyHeaderFlag */ static void pipe_msg(struct Mailbox *m, struct Email *e, FILE *fp, bool decode, bool print) { - int cmflags = 0; + CopyMessageFlags cmflags = MUTT_CM_NO_FLAGS; CopyHeaderFlags chflags = CH_FROM; pipe_set_flags(decode, print, &cmflags, &chflags); @@ -881,13 +882,13 @@ void mutt_display_address(struct Envelope *env) * @param[in] e Email * @param[in] decode If true, decode the message * @param[in] decrypt If true, decrypt the message - * @param[out] cmflags Copy message flags, e.g. MUTT_CM_DECODE + * @param[out] cmflags Flags, see #CopyMessageFlags * @param[out] chflags Flags, see #CopyHeaderFlags */ static void set_copy_flags(struct Email *e, bool decode, bool decrypt, - int *cmflags, CopyHeaderFlags *chflags) + CopyMessageFlags *cmflags, CopyHeaderFlags *chflags) { - *cmflags = 0; + *cmflags = MUTT_CM_NO_FLAGS; *chflags = CH_UPDATE_LEN; if ((WithCrypto != 0) && !decode && decrypt && (e->security & SEC_ENCRYPT)) @@ -941,8 +942,8 @@ static void set_copy_flags(struct Email *e, bool decode, bool decrypt, int mutt_save_message_ctx(struct Email *e, bool delete, bool decode, bool decrypt, struct Mailbox *m) { - int cmflags; - CopyHeaderFlags chflags; + CopyMessageFlags cmflags = MUTT_CM_NO_FLAGS; + CopyHeaderFlags chflags = CH_NO_FLAGS; int rc; set_copy_flags(e, decode, decrypt, &cmflags, &chflags); diff --git a/copy.c b/copy.c index 3c6caed77..ab944423c 100644 --- a/copy.c +++ b/copy.c @@ -584,12 +584,13 @@ static int count_delete_lines(FILE *fp, struct Body *b, LOFF_T *length, size_t d * @param fpout Where to write output * @param fpin Where to get input * @param e Email being copied - * @param cmflags Flags, e.g. #MUTT_CM_NOHEADER + * @param cmflags Flags, see #CopyMessageFlags * @param chflags Flags, see #CopyHeaderFlags * @retval 0 Success * @retval -1 Failure */ -int mutt_copy_message_fp(FILE *fpout, FILE *fpin, struct Email *e, int cmflags, CopyHeaderFlags chflags) +int mutt_copy_message_fp(FILE *fpout, FILE *fpin, struct Email *e, + CopyMessageFlags cmflags, CopyHeaderFlags chflags) { struct Body *body = e->content; char prefix[128]; @@ -787,7 +788,7 @@ int mutt_copy_message_fp(FILE *fpout, FILE *fpin, struct Email *e, int cmflags, * @param fpout FILE pointer to write to * @param src Source mailbox * @param e Email - * @param cmflags Flags, see: mutt_copy_message_fp() + * @param cmflags Flags, see #CopyMessageFlags * @param chflags Flags, see #CopyHeaderFlags * @retval 0 Success * @retval -1 Failure @@ -796,7 +797,7 @@ int mutt_copy_message_fp(FILE *fpout, FILE *fpin, struct Email *e, int cmflags, * like partial decode, where it is worth displaying as much as possible */ int mutt_copy_message_ctx(FILE *fpout, struct Mailbox *src, struct Email *e, - int cmflags, CopyHeaderFlags chflags) + CopyMessageFlags cmflags, CopyHeaderFlags chflags) { struct Message *msg = mx_msg_open(src, e->msgno); if (!msg) @@ -819,13 +820,13 @@ int mutt_copy_message_ctx(FILE *fpout, struct Mailbox *src, struct Email *e, * @param fpin where to get input * @param src source mailbox * @param e Email being copied - * @param cmflags mutt_open_copy_message() flags + * @param cmflags Flags, see #CopyMessageFlags * @param chflags Flags, see #CopyHeaderFlags * @retval 0 Success * @retval -1 Error */ static int append_message(struct Mailbox *dest, FILE *fpin, struct Mailbox *src, - struct Email *e, int cmflags, CopyHeaderFlags chflags) + struct Email *e, CopyMessageFlags cmflags, CopyHeaderFlags chflags) { char buf[256]; struct Message *msg = NULL; @@ -860,13 +861,13 @@ static int append_message(struct Mailbox *dest, FILE *fpin, struct Mailbox *src, * @param dest Destination Mailbox * @param src Source Mailbox * @param e Email - * @param cmflags mutt_open_copy_message() flags + * @param cmflags Flags, see #CopyMessageFlags * @param chflags Flags, see #CopyHeaderFlags * @retval 0 Success * @retval -1 Failure */ -int mutt_append_message(struct Mailbox *dest, struct Mailbox *src, - struct Email *e, int cmflags, CopyHeaderFlags chflags) +int mutt_append_message(struct Mailbox *dest, struct Mailbox *src, struct Email *e, + CopyMessageFlags cmflags, CopyHeaderFlags chflags) { struct Message *msg = mx_msg_open(src, e->msgno); if (!msg) diff --git a/copy.h b/copy.h index 7d71f3386..6e17950df 100644 --- a/copy.h +++ b/copy.h @@ -28,7 +28,8 @@ struct Email; struct Mailbox; -/**< flags to mutt_copy_message */ +typedef uint16_t CopyMessageFlags; ///< Flags for mutt_copy_message(), e.g. #MUTT_CM_NOHEADER +#define MUTT_CM_NO_FLAGS 0 ///< No flags are set #define MUTT_CM_NOHEADER (1 << 0) ///< Don't copy the message header #define MUTT_CM_PREFIX (1 << 1) ///< Quote the header and body #define MUTT_CM_DECODE (1 << 2) ///< Decode the message body into text/plain @@ -72,9 +73,9 @@ int mutt_copy_hdr(FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end, CopyHea int mutt_copy_header(FILE *in, struct Email *e, FILE *out, CopyHeaderFlags chflags, const char *prefix); -int mutt_copy_message_fp(FILE *fpout, FILE *fpin, struct Email *e, int cmflags, CopyHeaderFlags chflags); -int mutt_copy_message_ctx(FILE *fpout, struct Mailbox *src, struct Email *e, int cmflags, CopyHeaderFlags chflags); +int mutt_copy_message_fp(FILE *fpout, FILE *fpin, struct Email *e, CopyMessageFlags cmflags, CopyHeaderFlags chflags); +int mutt_copy_message_ctx(FILE *fpout, struct Mailbox *src, struct Email *e, CopyMessageFlags cmflags, CopyHeaderFlags chflags); -int mutt_append_message(struct Mailbox *dest, struct Mailbox *src, struct Email *e, int cmflags, CopyHeaderFlags chflags); +int mutt_append_message(struct Mailbox *dest, struct Mailbox *src, struct Email *e, CopyMessageFlags cmflags, CopyHeaderFlags chflags); #endif /* MUTT_COPY_H */ diff --git a/recvcmd.c b/recvcmd.c index c9fca85d4..f5926554d 100644 --- a/recvcmd.c +++ b/recvcmd.c @@ -678,7 +678,7 @@ static void attach_forward_msgs(FILE *fp, struct AttachCtx *actx, return; } - int cmflags = 0; + CopyMessageFlags cmflags = MUTT_CM_NO_FLAGS; if (C_ForwardQuote) { chflags |= CH_PREFIX; @@ -877,7 +877,7 @@ static int attach_reply_envelope_defaults(struct Envelope *env, struct AttachCtx */ static void attach_include_reply(FILE *fp, FILE *tmpfp, struct Email *cur) { - int cmflags = MUTT_CM_PREFIX | MUTT_CM_DECODE | MUTT_CM_CHARCONV; + CopyMessageFlags cmflags = MUTT_CM_PREFIX | MUTT_CM_DECODE | MUTT_CM_CHARCONV; CopyHeaderFlags chflags = CH_DECODE; mutt_make_attribution(Context->mailbox, cur, tmpfp); diff --git a/send.c b/send.c index c3e9bce95..e911b06bf 100644 --- a/send.c +++ b/send.c @@ -496,7 +496,7 @@ void mutt_forward_trailer(struct Mailbox *m, struct Email *e, FILE *fp) static int include_forward(struct Mailbox *m, struct Email *e, FILE *out) { CopyHeaderFlags chflags = CH_DECODE; - int cmflags = 0; + CopyMessageFlags cmflags = MUTT_CM_NO_FLAGS; mutt_parse_mime_message(m, e); mutt_message_hook(m, e, MUTT_MESSAGE_HOOK); @@ -577,7 +577,8 @@ void mutt_make_post_indent(struct Mailbox *m, struct Email *e, FILE *out) */ static int include_reply(struct Mailbox *m, struct Email *e, FILE *out) { - int cmflags = MUTT_CM_PREFIX | MUTT_CM_DECODE | MUTT_CM_CHARCONV | MUTT_CM_REPLYING; + CopyMessageFlags cmflags = + MUTT_CM_PREFIX | MUTT_CM_DECODE | MUTT_CM_CHARCONV | MUTT_CM_REPLYING; CopyHeaderFlags chflags = CH_DECODE; if ((WithCrypto != 0) && (e->security & SEC_ENCRYPT)) diff --git a/sendlib.c b/sendlib.c index d2cb750d3..9a7ac36a6 100644 --- a/sendlib.c +++ b/sendlib.c @@ -1465,7 +1465,7 @@ struct Body *mutt_make_message_attach(struct Mailbox *m, struct Email *e, bool a char buf[1024]; struct Body *body = NULL; FILE *fp = NULL; - int cmflags; + CopyMessageFlags cmflags; int pgp = WithCrypto ? e->security : 0; if (WithCrypto) @@ -1494,7 +1494,7 @@ struct Body *mutt_make_message_attach(struct Mailbox *m, struct Email *e, bool a mutt_parse_mime_message(m, e); CopyHeaderFlags chflags = CH_XMIT; - cmflags = 0; + cmflags = MUTT_CM_NO_FLAGS; /* If we are attaching a message, ignore C_MimeForwardDecode */ if (!attach_msg && C_MimeForwardDecode)