X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=protos.h;h=5b5395d3bb8d50e8e85e7049be31196abd1eb5e1;hp=586adaab250156a78d03bd3e78c790715c34f42f;hb=9fde23d2b9a4ba8076eb425a1af4342de1e485b5;hpb=f288d1771c814e6104da83e6f0f1761a40de1224

diff --git a/protos.h b/protos.h
index 586adaa..5b5395d 100644
--- a/protos.h
+++ b/protos.h
@@ -38,8 +38,10 @@ int is_from (const char *, char *, ssize_t, time_t *);
 
 const char *mutt_charset_hook (const char *);
 const char *mutt_iconv_hook (const char *);
-char *mutt_expand_path (char *, ssize_t);
-char *_mutt_expand_path (char *, ssize_t, int);
+
+ssize_t _mutt_expand_path (char *, ssize_t, int);
+#define mutt_expand_path(s, n) _mutt_expand_path((s), (n), 0)
+
 char *mutt_find_hook (int, const char *);
 char *mutt_get_body_charset (char *, ssize_t, BODY *);
 const char *mutt_get_name (address_t *);
@@ -56,13 +58,12 @@ void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv,
 void mutt_adv_mktemp (const char*, char*, ssize_t);
 int mutt_bounce_message (FILE * fp, HEADER *, address_t *);
 void mutt_check_rescore (CONTEXT *);
-void mutt_default_save (char *, ssize_t, HEADER *);
+void mutt_default_save (char *, ssize_t, const 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_enter_command (void);
 void mutt_expand_file_fmt (char *, ssize_t, const char *, const char *);
-void mutt_expand_fmt (char *, ssize_t, const char *, const char *);
 void mutt_fix_reply_recipients (ENVELOPE * env);
 void mutt_folder_hook (char *);
 void mutt_forward_intro (FILE * fp, HEADER * cur);
@@ -82,7 +83,6 @@ void mutt_mktemp (char *);
 void mutt_prepare_envelope (ENVELOPE *, int);
 void mutt_unprepare_envelope (ENVELOPE *);
 void mutt_pretty_mailbox (char *);
-void mutt_pretty_size (char *, ssize_t, long);
 void mutt_pipe_message (HEADER *);
 void mutt_print_message (HEADER *);
 void mutt_safe_path (char *s, ssize_t l, address_t * a);
@@ -114,7 +114,6 @@ int mutt_check_overwrite (const char *, const char *, char *, ssize_t, int *,
 int mutt_check_traditional_pgp (HEADER *, int *);
 int mutt_command_complete (char *, ssize_t, int, int);
 int mutt_var_value_complete (char *, ssize_t, int);
-int mutt_copy_body (FILE *, BODY **, BODY *);
 
 int mutt_display_message (HEADER * h);
 int mutt_dump_variables (int full);
@@ -130,7 +129,7 @@ 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 *, SPAM_LIST *, char *, int);
+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 *);