Use m_tempfile and better errors msg

[apps/madmutt.git] / protos.h

diff --git a/protos.h b/protos.h
index bd3afee..570166c 100644 (file)
--- a/protos.h
+++ b/protos.h
@@ -7,6 +7,11 @@
  * please see the file GPL in the top level source directory.
  */
 
+
+/* use the m_temp{fd,file} functions instead */
+void mutt_adv_mktemp (const char*, char*, ssize_t) __attribute__((deprecated));
+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 *,
@@ -32,21 +37,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 *);
@@ -59,17 +60,14 @@ const char *mutt_fqdn (short);
 void mutt_account_hook (const char *url);
 void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv,
                                     string_list_t *** pp, string_list_t *** qq);
-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,15 +81,11 @@ 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_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);
@@ -117,14 +111,12 @@ 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 **);
 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);
@@ -140,7 +132,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 *);