simplify mutt_expand_path

[apps/madmutt.git] / protos.h

diff --git a/protos.h b/protos.h
index bd3afee..5baa9dd 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -32,21 +32,17 @@ BODY *mutt_make_multipart (BODY *);
 CONTENT *mutt_get_content_info (const char *fname, BODY * b);
 
 int mutt_cmp_header (const HEADER*, const HEADER*);
-int mutt_cmp_addr (const address_t * a, const address_t * b);
-int mutt_cmp_list (const string_list_t * a, const string_list_t * b);
-int mutt_cmp_env (const ENVELOPE * e1, const ENVELOPE * e2);
-int mutt_cmp_body (const BODY * b1, const BODY * b2);
 
 time_t mutt_decrease_mtime (const char *, struct stat *);
-void mutt_set_mtime (const char*, const char*);
 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_gen_msgid (void);
 char *mutt_get_body_charset (char *, ssize_t, BODY *);
 const char *mutt_get_name (address_t *);
 const char *mutt_crypt_hook (address_t *);
@@ -62,14 +58,13 @@ 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_expand_link (char *, const char *, const char *);
 void mutt_fix_reply_recipients (ENVELOPE * env);
 void mutt_folder_hook (char *);
 void mutt_forward_intro (FILE * fp, HEADER * cur);
@@ -83,11 +78,9 @@ char *mutt_compile_help(char *, ssize_t, int, struct mapping_t *);
 void mutt_make_misc_reply_headers (ENVELOPE * env, CONTEXT * ctx,
                                    HEADER * cur, ENVELOPE * curenv);
 void mutt_make_post_indent (CONTEXT * ctx, HEADER * cur, FILE * out);
-void mutt_merge_envelopes (ENVELOPE* base, ENVELOPE** extra);
 void mutt_message_to_7bit (BODY *, FILE *);
 
-#define mutt_mktemp(a) _mutt_mktemp (a, __FILE__, __LINE__)
-void _mutt_mktemp (char *, const char *, int);
+void mutt_mktemp (char *);
 void mutt_prepare_envelope (ENVELOPE *, int);
 void mutt_unprepare_envelope (ENVELOPE *);
 void mutt_pretty_mailbox (char *);
@@ -117,7 +110,6 @@ void mutt_write_address_list (address_t * adr, FILE * fp, int linelen,
 
 int mutt_can_decode (BODY *);
 int mutt_change_flag (HEADER *, int);
-int mutt_check_menu (const char *);
 int mutt_check_month (const char *);
 int mutt_check_overwrite (const char *, const char *, char *, ssize_t, int *,
                           char **);