X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bdf27468d23eade733c0afb4327c9b88444b9058..efdccb093d1945ed1bffe0b8f8606ebc01c5926f:/h/prototypes.h

diff --git a/h/prototypes.h b/h/prototypes.h
index 64bd847b..92ed8ef5 100644
--- 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
@@ -21,13 +21,13 @@ void adios (const char *, const char *, ...) CHECK_PRINTF(2, 3) 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);
+char **brkstring (char *, char *, char *) NONNULL(1);
 
 /*
  * Check to see if we can display a given character set natively.
@@ -70,7 +70,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);
 
@@ -225,14 +225,19 @@ int m_atoi (char *);
 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_getfld2(m_getfld_state_t *, char[NAMESZ], char *, int *);
 int m_gmprot (void);
 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
@@ -365,7 +370,7 @@ 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);
@@ -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 */