X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=protos.h;h=068cc4aa789cec56fa21bb689e2014016b6a6fd5;hp=2f96bbccb8bc460bef722ca8f1cdbb777ff64879;hb=552847916ae6671d52db12880ee337f880cc766b;hpb=38dacbf03fe1a0daa9ce426caaef5582b90006b2

diff --git a/protos.h b/protos.h
index 2f96bbc..068cc4a 100644
--- a/protos.h
+++ b/protos.h
@@ -14,15 +14,9 @@ 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 *,
-                              anytype, format_flag);
-
-ssize_t m_strformat(char *, ssize_t, const char *, format_t *,
-                    anytype, format_flag);
-
 void set_quadoption (int, int);
 int query_quadoption (int, const char *);
+int query_quadoption2(int, const char *);
 int quadoption (int);
 
 int mutt_option_value (const char* val, char* dst, ssize_t dstlen);
@@ -43,8 +37,8 @@ int is_from (const char *, char *, ssize_t, time_t *);
 const char *mutt_charset_hook (const char *);
 const char *mutt_iconv_hook (const char *);
 
-ssize_t _mutt_expand_path (char *, ssize_t, int);
-#define mutt_expand_path(s, n) _mutt_expand_path((s), (n), 0)
+ssize_t _mutt_expand_path(char *, ssize_t, const char *, int);
+#define mutt_expand_path(s, n) _mutt_expand_path((s), (n), (s), 0)
 
 char *mutt_find_hook (int, const char *);
 char *mutt_get_body_charset (char *, ssize_t, BODY *);
@@ -52,7 +46,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,10 +55,10 @@ 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);
+void mutt_edit_headers(const char *, HEADER *, char *, ssize_t);
 void mutt_enter_command (void);
 void mutt_fix_reply_recipients (ENVELOPE * env);
 void mutt_folder_hook (char *);
@@ -136,7 +130,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 +158,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);