mhlsbr.c: Don't need to `else' after longjmp() at end of then-block.

[nmh] / h / prototypes.h

diff --git a/h/prototypes.h b/h/prototypes.h
index 64bd847b6fd7fc74ae6972186c100ca3eced444c..e62ea065c68a3eae9cfa3dcc8ba51f73bcf1f029 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -7,7 +7,7 @@
 /*
  * prototype from config.h
  */
-char *etcpath(char *);
+char *etcpath(char *) NONNULL(1);
 
 /*
  * prototypes from the nmh subroutine library
@@ -18,16 +18,17 @@ struct msgs_array;
 void add_profile_entry (const char *, const char *);
 void inform(char *fmt, ...) CHECK_PRINTF(1, 2);
 void adios (const char *, const char *, ...) CHECK_PRINTF(2, 3) NORETURN;
+void die(const char *, ...) CHECK_PRINTF(1, 2) NORETURN;
 void admonish (char *, char *, ...) CHECK_PRINTF(2, 3);
 void advertise (const char *, char *, const char *, va_list) CHECK_PRINTF(3, 0);
 void advise (const char *, const char *, ...) CHECK_PRINTF(2, 3);
-char **argsplit (char *, char **, int *);
-void argsplit_msgarg (struct msgs_array *, char *, char **);
-void argsplit_insert (struct msgs_array *, char *, char **);
+char **argsplit (char *, char **, int *) NONNULL(1, 2);
+void argsplit_msgarg (struct msgs_array *, char *, char **) NONNULL(1, 2, 3);
+void argsplit_insert (struct msgs_array *, char *, char **) NONNULL(1, 2, 3);
 void arglist_free (char *, char **);
-void ambigsw (const char *, const struct swit *);
-int atooi(char *);
-char **brkstring (char *, char *, char *);
+void ambigsw (const char *, const struct swit *) NONNULL(1, 2);
+int atooi(char *) NONNULL(1) PURE;
+char **brkstring (char *, char *, char *) NONNULL(1);
 
 /*
  * Check to see if we can display a given character set natively.
@@ -45,9 +46,9 @@ int client(char *, char *, char *, int, int);
 void closefds(int);
 char *concat (const char *, ...);
 int context_del (char *);
-char *context_find (const char *);
+char *context_find (const char *) PURE;
 char *context_find_by_type (const char *, const char *, const char *);
-int context_find_prefix(const char *);
+int context_find_prefix(const char *) PURE;
 int context_foil (char *);
 void context_read (void);
 void context_replace (char *, char *);
@@ -70,7 +71,7 @@ void discard (FILE *);
  *
  * Returns the decoded value, -1 if the conversion failed.
  */
-int decode_qp(unsigned char byte1, unsigned char byte2);
+int decode_qp(unsigned char byte1, unsigned char byte2) CONST;
 
 int default_done (int);
 
@@ -168,7 +169,7 @@ char *get_charset(void);
 char *getcpy(const char *str);
 
 char *get_default_editor(void);
-char *getfolder(int);
+char *getfolder(int) PURE;
 
 /*
  * Get a string from the terminfo database for the current terminal.
@@ -221,18 +222,23 @@ char *get_term_stringparm(char *capability, long arg1, long arg2);
  */
 int get_term_numcap(char *capability);
 
-int m_atoi (char *);
+int m_atoi (char *) PURE;
 char *m_backup (const char *);
 int m_convert (struct msgs *, char *);
 char *m_draft (char *, char *, int, int *);
+
+m_getfld_state_t m_getfld_state_init(FILE *iob);
 void m_getfld_state_reset (m_getfld_state_t *);
 void m_getfld_state_destroy (m_getfld_state_t *);
 void m_getfld_track_filepos (m_getfld_state_t *, FILE *);
+void m_getfld_track_filepos2(m_getfld_state_t *);
 int m_getfld (m_getfld_state_t *, char[NAMESZ], char *, int *, FILE *);
-int m_gmprot (void);
+int m_getfld2(m_getfld_state_t *, char[NAMESZ], char *, int *);
+int m_gmprot (void) PURE;
 char *m_name (int);
 
 void m_unknown(m_getfld_state_t *, FILE *);
+void m_unknown2(m_getfld_state_t *);
 
 /*
  * Clear the screen, using the appropriate entry from the terminfo database
@@ -249,7 +255,7 @@ void print_intro (FILE *, int);
 void print_sw (const char *, const struct swit *, char *, FILE *);
 void print_version (char *);
 void push (void);
-char *r1bindex(char *, int);
+char *r1bindex(char *, int) PURE;
 void readconfig (struct node **, FILE *, const char *, int);
 int refile (char **, char *);
 
@@ -306,7 +312,7 @@ void seq_setcur (struct msgs *, int);
 void seq_setprev (struct msgs *);
 void seq_setunseen (struct msgs *, int);
 int showfile (char **, char *);
-int smatch(const char *, const struct swit *);
+int smatch(const char *, const struct swit *) PURE;
 
 /*
  * Convert a set of bit flags to printable format.
@@ -341,11 +347,11 @@ int smatch(const char *, const struct swit *);
  * from least significant bit to most significant.
  */
 char *snprintb (char *buffer, size_t size, unsigned flags, char *bitfield);
-int ssequal (const char *, const char *);
-int stringdex (char *, char *);
+int ssequal (const char *, const char *) PURE;
+int stringdex (char *, char *) PURE;
 char *trimcpy (char *);
 
-int uprf (const char *, const char *);
+int uprf (const char *, const char *) PURE;
 int vfgets (FILE *, char **);
 
 /*
@@ -365,11 +371,10 @@ char *SystemName(void);
 /*
  * prototypes for some routines in uip
  */
-int annotate (char *, char *, char *, int, int, int, int);
+int annotate (char *, char *, char *, bool, bool, int, bool);
 void annolist(char *, char *, char *, int);
 void annopreserve(int);
 void m_pclose(void);
-int make_intermediates(char *);
 int mhl(int, char **);
 int mhlsbr(int, char **, FILE *(*)(char *));
 int distout (char *, char *, char *);
@@ -380,10 +385,10 @@ int sc_width(void);
 int build_form (char *, char *, int *, char *, char *, char *, char *,
                char *, char *);
 int sendsbr (char **, int, char *, char *, struct stat *, int, const char *);
-int SOprintf (char *, ...);
+int SOprintf (char *, ...) CHECK_PRINTF(1, 2);
 int what_now (char *, int, int, char *, char *,
        int, struct msgs *, char *, int, char *, int);
-int WhatNow(int, char **);
+int WhatNow(int, char **) NORETURN;
 
 /* Includes trailing NUL */