X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=h%2Fprototypes.h;h=c54172bca82d4868f0415d093e516287fdeffd7b;hp=a91418e2c9d5cc4be33129007452b83e11ba3834;hb=337338b404931f06f0db2119c9e145e8ca5a9860;hpb=13f84dd50ca5754391dbd3296a5c7425f9363600

diff --git a/h/prototypes.h b/h/prototypes.h
index a91418e..c54172b 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -1,8 +1,5 @@
-
 /*
  * prototypes.h -- various prototypes
- *
- * $Id$
  */
 
 /*
@@ -25,7 +22,7 @@ char *etcpath(char *);
 /*
  * prototypes from the nmh subroutine library
  */
-void adios (char *, char *, ...);
+void adios (char *, char *, ...) NORETURN;
 void admonish (char *, char *, ...);
 void advertise (char *, char *, char *, va_list);
 void advise (char *, char *, ...);
@@ -47,7 +44,7 @@ void cpydata (int, int, char *, char *);
 void cpydgst (int, int, char *, char *);
 int decode_rfc2047 (char *, char *, size_t);
 void discard (FILE *);
-int done (int);
+int default_done (int);
 int ext_hook(char *, char *, char *);
 int fdcompare (int, int);
 int folder_addmsg (struct msgs **, char *, int, int, int, int, char *);
@@ -70,16 +67,15 @@ int lkopen(char *, int, mode_t);
 int m_atoi (char *);
 char *m_backup (char *);
 int m_convert (struct msgs *, char *);
-char *m_draft (char *, char *, int, int *);
-void m_eomsbr (int (*)());
+char *m_draft (char *);
 int m_getfld (int, unsigned char *, unsigned char *, int, FILE *);
 int m_gmprot (void);
 char *m_maildir (char *);
 char *m_mailpath (char *);
 char *m_name (int);
 int m_putenv (char *, char *);
-char *m_scratch (char *, char *);
-char *m_tmpfil (char *);
+char *m_mktemp(const char *, int *, FILE **);
+char *m_mktemp2(const char *, const char *, int *, FILE **);
 void m_unknown(FILE *);
 int makedir (char *);
 char *nmh_getpass(const char *);
@@ -91,15 +87,14 @@ int pidwait (pid_t, int);
 int pidstatus (int, FILE *, char *);
 char *pluspath(char *);
 void print_help (char *, struct swit *, int);
-void print_sw (char *, struct swit *, char *);
+void print_sw (char *, struct swit *, char *, FILE *);
 void print_version (char *);
 void push (void);
 char *pwd (void);
 char *r1bindex(char *, int);
 void readconfig (struct node **, FILE *, char *, int);
 int refile (char **, char *);
-int ruserpass(char *, char **, char **);
-int remdir (char *);
+void ruserpass(char *, char **, char **);
 int seq_addmsg (struct msgs *, char *, int, int, int);
 int seq_addsel (struct msgs *, char *, int, int);
 char *seq_bits (struct msgs *);
@@ -162,4 +157,3 @@ void replout (FILE *, char *, char *, struct msgs *, int,
 int sendsbr (char **, int, char *, struct stat *, int, char *, int);
 int what_now (char *, int, int, char *, char *,
 	int, struct msgs *, char *, int, char *);
-