Use m_temp instead of mutt_mktemp in compress code

[apps/madmutt.git] / protos.h

diff --git a/protos.h b/protos.h
index 2dc73ef..0207638 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -14,13 +14,6 @@ void mutt_mktemp (char *) __attribute__((deprecated));
 
 #define MoreArgs(p) (*p->dptr && *p->dptr != ';' && *p->dptr != '#')
 
-typedef const char *format_t (char *, ssize_t, char, const char *,
-                              const char *, const char *, const char *,
-                              unsigned long, format_flag);
-
-ssize_t m_strformat(char *, ssize_t, const char *, format_t *,
-                          unsigned long, format_flag);
-
 void set_quadoption (int, int);
 int query_quadoption (int, const char *);
 int quadoption (int);
@@ -136,7 +129,7 @@ int mutt_parse_exec (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 int mutt_parse_hook (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 int mutt_parse_macro (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 int mutt_parse_push (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-int mutt_parse_rc_line ( /* const */ char *, BUFFER *, BUFFER *);
+int mutt_parse_rc_line (const char *, BUFFER *, BUFFER *);
 int mutt_parse_score (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 int mutt_parse_unscore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 int mutt_parse_unhook (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -164,13 +157,15 @@ void ci_bounce_message (HEADER *, int *);
 int ci_send_message (int, HEADER *, char *, CONTEXT *, HEADER *);
 
 /* flags for mutt_extract_token() */
-#define M_TOKEN_EQUAL          1       /* treat '=' as a special */
-#define M_TOKEN_CONDENSE       (1<<1)  /* ^(char) to control chars (macros) */
-#define M_TOKEN_SPACE          (1<<2)  /* don't treat whitespace as a term */
-#define M_TOKEN_QUOTE          (1<<3)  /* don't interpret quotes */
-#define M_TOKEN_PATTERN                (1<<4)  /* !)|~ are terms (for patterns) */
-#define M_TOKEN_COMMENT                (1<<5)  /* don't reap comments */
-#define M_TOKEN_SEMICOLON      (1<<6)  /* don't treat ; as special */
+#define M_TOKEN_EQUAL          (1 << 0)  /* treat '=' as a special */
+#define M_TOKEN_CONDENSE       (1 << 1)  /* ^(char) to control chars (macros) */
+#define M_TOKEN_SPACE          (1 << 2)  /* don't treat whitespace as a term */
+#define M_TOKEN_PATTERN                (1 << 3)  /* !)|~ are terms (for patterns) */
+
+/* equivalent to M_TOKEN_PATTERN */
+#define M_TOKEN_COMMENT                (1 << 4)  /* don't reap comments */
 
+/* implies M_TOKEN_SPACE */
+#define M_TOKEN_QUOTE          (1 << 5)  /* don't interpret quotes */
 int mutt_extract_token(BUFFER *, BUFFER *, int);