<<< Date Index >>>     <<< Thread Index >>>

[PATCH] noop cleanup: move mutt_copy_header flags to copy.h



# HG changeset patch
# User Aron Griffis <agriffis@xxxxxxxxx>
# Date 1216650298 14400
# Branch HEAD
# Node ID e9e20e03c7a00f7b12113dbde2b805f5b704a701
# Parent  f135d64e008266657012e89ab41594387e7cb533
noop cleanup: move mutt_copy_header flags to copy.h

Noticed while reading that these flags are better defined in copy.h than mutt.h.
Builds without warnings.

Signed-off-by: Aron Griffis <agriffis@xxxxxxxxx>

diff -r f135d64e0082 -r e9e20e03c7a0 copy.h
--- a/copy.h    Thu Jul 17 19:48:16 2008 +0200
+++ b/copy.h    Mon Jul 21 10:24:58 2008 -0400
@@ -27,14 +27,31 @@
 #define M_CM_PRINTING  (1<<7)  /* printing the message - display light */
 #define M_CM_REPLYING  (1<<8)  /* replying the message */
 
-
 #define M_CM_DECODE_PGP          (1<<9) /* used for decoding PGP messages */
 #define M_CM_DECODE_SMIME (1<<10) /* used for decoding S/MIME messages */
 #define M_CM_DECODE_CRYPT  (M_CM_DECODE_PGP | M_CM_DECODE_SMIME)
 
-
 #define M_CM_VERIFY    (1<<11) /* do signature verification */
 
+/* flags for mutt_copy_header() */
+#define CH_UPDATE         1       /* update the status and x-status fields? */
+#define CH_WEED           (1<<1)  /* weed the headers? */
+#define CH_DECODE         (1<<2)  /* do RFC1522 decoding? */
+#define CH_XMIT           (1<<3)  /* transmitting this message? */
+#define CH_FROM           (1<<4)  /* retain the "From " message separator? */
+#define CH_PREFIX         (1<<5)  /* use Prefix string? */
+#define CH_NOSTATUS       (1<<6)  /* suppress the status and x-status fields */
+#define CH_REORDER        (1<<7)  /* Re-order output of headers */
+#define CH_NONEWLINE      (1<<8)  /* don't output terminating newline */
+#define CH_MIME           (1<<9)  /* ignore MIME fields */
+#define CH_UPDATE_LEN     (1<<10) /* update Lines: and Content-Length: */
+#define CH_TXTPLAIN       (1<<11) /* generate text/plain MIME headers */
+#define CH_NOLEN          (1<<12) /* don't write Content-Length: and Lines: */
+#define CH_WEED_DELIVERED (1<<13) /* weed eventual Delivered-To headers */
+#define CH_FORCE_FROM     (1<<14) /* give CH_FROM precedence over CH_WEED? */
+#define CH_NOQFROM        (1<<15) /* ignore ">From " line */
+#define CH_UPDATE_IRT     (1<<16) /* update In-Reply-To: */
+#define CH_UPDATE_REFS    (1<<17) /* update References: */
 
 
 int mutt_copy_hdr (FILE *, FILE *, LOFF_T, LOFF_T, int, const char *);
diff -r f135d64e0082 -r e9e20e03c7a0 mutt.h
--- a/mutt.h    Thu Jul 17 19:48:16 2008 +0200
+++ b/mutt.h    Mon Jul 21 10:24:58 2008 -0400
@@ -74,26 +74,6 @@
 #define WHERE_DEFINED 1
 
 #include "mutt_regex.h"
-
-/* flags for mutt_copy_header() */
-#define CH_UPDATE      1      /* update the status and x-status fields? */
-#define CH_WEED                (1<<1) /* weed the headers? */
-#define CH_DECODE      (1<<2) /* do RFC1522 decoding? */
-#define CH_XMIT                (1<<3) /* transmitting this message? */
-#define CH_FROM                (1<<4) /* retain the "From " message separator? 
*/
-#define CH_PREFIX      (1<<5) /* use Prefix string? */
-#define CH_NOSTATUS    (1<<6) /* supress the status and x-status fields */
-#define CH_REORDER     (1<<7) /* Re-order output of headers */
-#define CH_NONEWLINE   (1<<8) /* don't output terminating newline */
-#define CH_MIME                (1<<9) /* ignore MIME fields */
-#define CH_UPDATE_LEN  (1<<10) /* update Lines: and Content-Length: */
-#define CH_TXTPLAIN    (1<<11) /* generate text/plain MIME headers */
-#define CH_NOLEN       (1<<12) /* don't write Content-Length: and Lines: */
-#define CH_WEED_DELIVERED (1<<13) /* weed eventual Delivered-To headers */
-#define CH_FORCE_FROM  (1<<14) /* give CH_FROM precedence over CH_WEED? */
-#define CH_NOQFROM     (1<<15) /* give CH_FROM precedence over CH_WEED? */
-#define CH_UPDATE_IRT  (1<<16) /* update In-Reply-To: */
-#define CH_UPDATE_REFS (1<<17) /* update References: */
 
 /* flags for mutt_enter_string() */
 #define  M_ALIAS   1      /* do alias "completion" by calling up the 
alias-menu */