Part of the patch from bug #4301; clean up our prototypes, a lot. Still

plenty of work to do!

diff --git a/h/prototypes.h b/h/prototypes.h
index ad9a87ee00eba9706125231ab27baa49047b3ccc..935c593131e0ea2087dd796e4fde82dfad122327 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -59,7 +59,7 @@ int gans (char *, struct swit *);
 char **getans (char *, struct swit *);
 int getanswer (char *);
 char **getarguments (char *, int, char **, int);
 char **getans (char *, struct swit *);
 int getanswer (char *);
 char **getarguments (char *, int, char **, int);

-char *get_charset();
+char *get_charset(void);

 char *getcpy (char *);
 char *getfolder(int);
 int lkclose(int, char*);
 char *getcpy (char *);
 char *getfolder(int);
 int lkclose(int, char*);


@@ -143,12 +143,23 @@ char *OfficialName(char *);
 int annotate (char *, char *, char *, int, int, int, int);
 void annolist(char *, char *, char *, int);
 void annopreserve(int);
 int annotate (char *, char *, char *, int, int, int, int);
 void annolist(char *, char *, char *, int);
 void annopreserve(int);

+void clear_screen(void);
+void m_pclose(void);
+int make_intermediates(char *);
+int mhl(int, char **);
+int mhlsbr(int, char **, FILE *(*)(char *));

 int distout (char *, char *, char *);
 void replout (FILE *, char *, char *, struct msgs *, int,
        int, char *, char *, char *);
 int distout (char *, char *, char *);
 void replout (FILE *, char *, char *, struct msgs *, int,
        int, char *, char *, char *);

+void set_endian(void);
+int sc_hardcopy(void);
+int sc_length(void);
+int sc_width(void);

 int build_form (char *, char *, int *, char *, char *, char *, char *,
                char *, char *);
 int sendsbr (char **, int, char *, struct stat *, int, char *, int);
 int build_form (char *, char *, int *, char *, char *, char *, char *,
                char *, char *);
 int sendsbr (char **, int, char *, struct stat *, int, char *, int);

+int SOprintf (char *, ...);

 int what_now (char *, int, int, char *, char *,
        int, struct msgs *, char *, int, char *);
 int what_now (char *, int, int, char *, char *,
        int, struct msgs *, char *, int, char *);

-
+int WhatNow(int, char **);
+int writeBase64aux(FILE *, FILE *);

diff --git a/uip/ap.c b/uip/ap.c
index a0f7f778f6517b9c126bc0e62d376c86ed3afde3..b0934fbcebbb035a1f3c54825fb38b4b0451b816 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -41,11 +41,6 @@ static struct format *fmt;
 
 static int dat[5];
 
 
 static int dat[5];
 

-/*
- * prototypes
- */
-int sc_width (void);  /* from termsbr.c */
-

 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

diff --git a/uip/dp.c b/uip/dp.c
index c94c8eac0ccfb33cf48e69b9e15c1e729b39b492..4e9c5cb8ba78080b0f72f91afb2a3b00d0ba0516 100644 (file)
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -36,11 +36,6 @@ static struct format *fmt;
 
 static int dat[5];
 
 
 static int dat[5];
 

-/*
- * prototypes
- */
-int sc_width (void);  /* from termsbr.c */
-

 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index d7a3cf08fc72b4492ea732ec94004b71b1c4ba92..ad674f412342368ea028462034abeab6e99d1d2a 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -103,9 +103,6 @@ int output_message_fp (CT, FILE *, char*);
 /* mhlistsbr.c */
 int list_all_messages (CT *, int, int, int, int);
 
 /* mhlistsbr.c */
 int list_all_messages (CT *, int, int, int, int);
 

-/* mhmisc.c */
-void set_endian (void);
-

 /* mhfree.c */
 void free_content (CT);
 
 /* mhfree.c */
 void free_content (CT);
 

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index c349bf8beae3039b4b327aa695411f95979154eb..e7917133c7c114891bca58534e6a89cad3cc5c2b 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -59,7 +59,6 @@ static char prefix[] = "----- =_aaaaaaaaaa";
 
 
 /* mhmisc.c */
 
 
 /* mhmisc.c */

-int make_intermediates (char *);

 void content_error (char *, CT, char *, ...);
 
 /* mhcachesbr.c */
 void content_error (char *, CT, char *, ...);
 
 /* mhcachesbr.c */

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index eee863117caf9b1becebc1cce358a46acd62ec56..2c188653a3a8d104aed9c15c15cce034dceb9b20 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -41,13 +41,9 @@ char *cache_public;
 char *cache_private;
 
 
 char *cache_private;
 
 

-/* mhparse.c (OR) mhbuildsbr.c */
-int pidcheck (int);
-

 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);

-int make_intermediates (char *);

 void content_error (char *, CT, char *, ...);
 void flush_errors (void);
 
 void content_error (char *, CT, char *, ...);
 void flush_errors (void);
 

diff --git a/uip/mhl.c b/uip/mhl.c
index de12dde87390b5c09b501754377d2b2b56052a6d..490813d7460a135ea8f8a05a243b8dcaa614c24c 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -9,9 +9,6 @@
 
 #include <h/mh.h>
 
 
 #include <h/mh.h>
 

-/* prototype from mhlsbr.c */
-int mhl (int, char **);
-

 
 int
 main (int argc, char **argv)
 
 int
 main (int argc, char **argv)

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 664be9f6b8fe5c8e7378b25abca845e25c20200c..312705ad35178ab4850758a08e7a9b663fc0b886 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -94,7 +94,6 @@ CT parse_mime (char *);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);

-void set_endian (void);

 void flush_errors (void);
 
 /* mhlistsbr.c */
 void flush_errors (void);
 
 /* mhlistsbr.c */

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 68cb7f9c220679159f6dd65bd07ba0b0c2b81766..e961b9b0e0f6058c765c4f72d6334d9b7320e38c 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -290,16 +290,6 @@ static void mhldone (int);
 static void m_popen (char *);
 static void filterbody (struct mcomp *, char *, int, int, FILE *);
 
 static void m_popen (char *);
 static void filterbody (struct mcomp *, char *, int, int, FILE *);
 

-int mhl (int, char **);
-int mhlsbr (int, char **, FILE *(*)());
-void m_pclose (void);
-
-void clear_screen (void);             /* from termsbr.c */
-int SOprintf (char *, ...);           /* from termsbr.c */
-int sc_width (void);                  /* from termsbr.c */
-int sc_length (void);                 /* from termsbr.c */
-int sc_hardcopy (void);               /* from termsbr.c */
-

 
 int
 mhl (int argc, char **argv)
 
 int
 mhl (int argc, char **argv)

diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index 7a2313922f2ee9ed994902d55792cac502c69ad9..e8a30aceb1a5cdcfb2c051cc5413ef6cbc342fa3 100644 (file)
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -34,8 +34,6 @@ static char *errs = NULL;
  */
 int part_ok (CT, int);
 int type_ok (CT, int);
  */
 int part_ok (CT, int);
 int type_ok (CT, int);

-void set_endian (void);
-int make_intermediates (char *);

 void content_error (char *, CT, char *, ...);
 void flush_errors (void);
 
 void content_error (char *, CT, char *, ...);
 void flush_errors (void);
 

diff --git a/uip/mhn.c b/uip/mhn.c
index 6a46ca5da709674a9f957fd2ba25e5705ba05bac..3d8801eec3753e17181837bd7fd2ca9a30c8ac89 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -173,7 +173,6 @@ CT parse_mime (char *);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);

-void set_endian (void);

 void flush_errors (void);
 
 /* mhshowsbr.c */
 void flush_errors (void);
 
 /* mhshowsbr.c */

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 72e7bd40f7dae70896db9a2ee3213bc93ba58982..8324991d7aba174eac6f30e72a26fd10739b5152 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -65,7 +65,6 @@ static char nib2b64[0x40+1] =
  */
 int output_message (CT, char *);
 int output_message_fp (CT, FILE *, char *);
  */
 int output_message (CT, char *);
 int output_message_fp (CT, FILE *, char *);

-int writeBase64aux (FILE *, FILE *);

 
 /*
  * static prototypes
 
 /*
  * static prototypes

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 5b48483ae915b94cfaf4ceb817baedc218346302..e9a4ceebeb11cc4fa6b9ddc75dbdefe7e45fc163 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -85,16 +85,12 @@ struct k2v SubApplication[] = {
 };
 
 
 };
 
 

-/* ftpsbr.c */
-int ftp_get (char *, char *, char *, char *, char *, char *, int, int);
-

 /* mhcachesbr.c */
 int find_cache (CT, int, int *, char *, char *, int);
 
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
 /* mhcachesbr.c */
 int find_cache (CT, int, int *, char *, char *, int);
 
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);

-int make_intermediates (char *);

 void content_error (char *, CT, char *, ...);
 
 /* mhfree.c */
 void content_error (char *, CT, char *, ...);
 
 /* mhfree.c */

diff --git a/uip/mhshow.c b/uip/mhshow.c
index ea34914b2cb6933bea4887207b1954a3d6e9d670..eb9c41296d8648f6f5c42e72df076e6f5d795660 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -110,7 +110,6 @@ CT parse_mime (char *);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);

-void set_endian (void);

 void flush_errors (void);
 
 /* mhshowsbr.c */
 void flush_errors (void);
 
 /* mhshowsbr.c */

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 5abd67dc353b5d568a8e96a69b89791a086a6010..6bfc0bcd0de2646d8ba65226c3c8ef3a61f5eec5 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -38,12 +38,6 @@ pid_t xpid = 0;
 static sigjmp_buf intrenv;
 
 
 static sigjmp_buf intrenv;
 
 

-/* termsbr.c */
-int SOprintf (char *, ...);
-
-/* mhparse.c */
-int pidcheck (int);
-

 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 2646ba62955068df15915bbf263a9e75a3f26554..7814dd276d6516f09088e15b3d56f97c44ab5cc8 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -88,7 +88,6 @@ CT parse_mime (char *);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);

-void set_endian (void);

 void flush_errors (void);
 
 /* mhstoresbr.c */
 void flush_errors (void);
 
 /* mhstoresbr.c */

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 596218494a0783aa288a858d6edece558b33aadc..58ed5becdcedc021e7775d36878f1d093129640a 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -48,7 +48,6 @@ typedef int (*qsort_comp) (const void *, const void *);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);

-int make_intermediates (char *);

 void flush_errors (void);
 
 /* mhshowsbr.c */
 void flush_errors (void);
 
 /* mhshowsbr.c */

diff --git a/uip/mhtest.c b/uip/mhtest.c
index cde45dbdf6f92249048fc7aa140235ed481beb79..e5c4545dcea710bea5e890c2a75f773644b57526 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -93,7 +93,6 @@ int output_message (CT, char *);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);

-void set_endian (void);

 void flush_errors (void);
 
 /* mhfree.c */
 void flush_errors (void);
 
 /* mhfree.c */

diff --git a/uip/msh.c b/uip/msh.c
index 43530db3946bcfbc23937d5c395d294a25455732..f6d1a362b4cc9f2c59125e57957418b549136e4e 100644 (file)
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -153,8 +153,6 @@ int told_to_quit;           /* SIGQUIT detected */
 /*
  * prototypes
  */
 /*
  * prototypes
  */

-int SOprintf (char *, ...);  /* from termsbr.c */
-int sc_width (void);         /* from termsbr.c */

 void fsetup (char *);
 void setup (char *);
 FILE *msh_ready (int, int);
 void fsetup (char *);
 void setup (char *);
 FILE *msh_ready (int, int);

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index 19d8b5b2f3973ddbb0642787fd375ee5e5400b47..9937a1dd31b73726ad5d58dacc15beb8c47325d1 100644 (file)
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -32,13 +32,6 @@ static FILE *mhlfp;
  */
 typedef int (*qsort_comp) (const void *, const void *);
 
  */
 typedef int (*qsort_comp) (const void *, const void *);
 

-/*
- * prototypes
- */
-void clear_screen (void);   /* from termsbr.c */
-int SOprintf (char *, ...); /* from termsbr.c */
-int sc_width (void);        /* from termsbr.c */
-

 /*
  * static prototypes
  */
 /*
  * static prototypes
  */


@@ -58,9 +51,6 @@ static int process (int, char *, int, char **);
 static void copy_message (int, FILE *);
 static void copy_digest (int, FILE *);
 
 static void copy_message (int, FILE *);
 static void copy_digest (int, FILE *);
 

-/* from mhlsbr.c */
-int mhlsbr (int, char **, FILE *(*)());
-

 void
 forkcmd (char **args, char *pgm)
 {
 void
 forkcmd (char **args, char *pgm)
 {

diff --git a/uip/scansbr.c b/uip/scansbr.c
index ae347e85726080b66ec28e462d1fbdb16f32b71d..835a88483d79c8ed40300b1933eb21d014a273ad 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -56,7 +56,6 @@ char *scanl = 0;                      /* text of most recent scanline    */
 /*
  * prototypes
  */
 /*
  * prototypes
  */

-int sc_width (void);                   /* from termsbr.c */

 static int mh_fputs(char *, FILE *);
 
 #ifdef MULTIBYTE_SUPPORT
 static int mh_fputs(char *, FILE *);
 
 #ifdef MULTIBYTE_SUPPORT

diff --git a/uip/show.c b/uip/show.c
index a59e10c35f0ae08b3151d08ea5c8e156b172d69a..1b11871ee2f1434c5cba62d954984ed22743bacc 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -52,9 +52,6 @@ static struct swit switches[] = {
  */
 static int is_nontext(char *);
 
  */
 static int is_nontext(char *);
 

-/* prototype from mhlsbr.c */
-int mhl (int, char **);
-

 #define        SHOW  0
 #define        NEXT  1
 #define        PREV  2
 #define        SHOW  0
 #define        NEXT  1
 #define        PREV  2

diff --git a/uip/viamail.c b/uip/viamail.c
index 49bbdf4feed8ab9a3e6c9293bc82d1fc354ff378..12412c74709f3c383fdced8bc857927c8f55b7cc 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -52,12 +52,6 @@ extern int verbsw;
 
 int ebcdicsw = 0;      /* hack for linking purposes */
 
 
 int ebcdicsw = 0;      /* hack for linking purposes */
 

-/* mhmisc.c */
-void set_endian (void);
-
-/* mhoutsbr.c */
-int writeBase64aux (FILE *, FILE *);
-

 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

diff --git a/uip/whatnow.c b/uip/whatnow.c
index d3fccfd6af501c45b8d57f01d9ead13a89ea07fe..be50bc92d603e60fbac1ab56c07d981e0ecdc32e 100644 (file)
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -9,9 +9,6 @@
 
 #include <h/mh.h>
 
 
 #include <h/mh.h>
 

-/* from whatnowsbr.c */
-int WhatNow (int, char **);
-

 
 int
 main (int argc, char **argv)
 
 int
 main (int argc, char **argv)

diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c
index 6bf4b369d47d4907aef58360fa9c248c392fb9d1..293d5ceb3c6f8ad0b51e00352b7b8a884615c8e8 100644 (file)
--- a/uip/whatnowproc.c
+++ b/uip/whatnowproc.c
@@ -19,9 +19,6 @@
  * it will call this routine directly without exec'ing it.
  */
 
  * it will call this routine directly without exec'ing it.
  */
 

-/* from whatnowsbr.c */
-int WhatNow (int, char **);
-

 
 int
 what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,
 
 int
 what_now (char *ed, int nedit, int use, char *file, char *altmsg, int dist,