X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=protos.h;h=6f9f5b122a3e98123ea62221d28ce91871d10635;hp=20b04ac9c1a58a9f2891d91d9beda37bff80863f;hb=fc7b90fd61ac9efd35a5b506cc10679969d84cba;hpb=8336b26fc23c7943bf6681ba2c290bb5cd2c54b8

diff --git a/protos.h b/protos.h
index 20b04ac..6f9f5b1 100644
--- 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);
-
-void mutt_FormatString (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);
@@ -52,7 +45,7 @@ const char *mutt_get_name (address_t *);
 const char *mutt_crypt_hook (address_t *);
 char *mutt_make_date (char *, ssize_t);
 
-const char *mutt_make_version (int full);
+const char *mutt_make_version(void);
 
 const char *mutt_fqdn (short);
 
@@ -61,7 +54,7 @@ void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv,
                                     string_list_t *** pp, string_list_t *** qq);
 int mutt_bounce_message (FILE * fp, HEADER *, address_t *);
 void mutt_check_rescore (CONTEXT *);
-void mutt_default_save (char *, ssize_t, const HEADER *);
+void mutt_default_save (char *, ssize_t, HEADER *);
 void mutt_display_address (ENVELOPE *);
 void mutt_edit_content_type (HEADER *, BODY *, FILE *);
 void mutt_edit_headers (const char *, const char *, HEADER *, char *, ssize_t);
@@ -130,18 +123,16 @@ int mutt_invoke_mta (address_t *, address_t *, address_t *, address_t *, const c
 int mutt_is_list_cc (int, address_t *, address_t *);
 int mutt_is_list_recipient (int, address_t *, address_t *);
 int mutt_lookup_mime_type (BODY *, const char *);
-int mutt_match_spam_list (const char *, rx_t *, char *, int);
 int mutt_num_postponed (int);
 int mutt_parse_bind (BUFFER *, BUFFER *, unsigned long, BUFFER *);
 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 *);
-int mutt_pattern_func (int, char *);
 int mutt_query_variables (string_list_t * queries);
 int _mutt_save_message (HEADER *, CONTEXT *, int, int, int);
 int mutt_save_message (HEADER *, int, int, int, int *);
@@ -162,26 +153,19 @@ int mutt_save_confirm (const char *, struct stat *);
 void mutt_to_base64 (unsigned char *, const unsigned char *, ssize_t, ssize_t);
 int mutt_from_base64 (char *, const char *);
 
-#define new_pattern() p_new(pattern_t, 1)
-#define mutt_new_enter_state() p_new(ENTER_STATE, 1)
-
-int mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
-                       CONTEXT * ctx, HEADER * h);
-pattern_t *mutt_pattern_comp ( /* const */ char *s, int flags, BUFFER * err);
-void mutt_check_simple (char *s, ssize_t len, const char *simple);
-void mutt_pattern_free (pattern_t ** pat);
-
 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);