From df6971a59e8d01dcfe605bbac949b7d4b3ab0a92 Mon Sep 17 00:00:00 2001 From: Ken Hornstein Date: Tue, 28 Feb 2012 10:32:41 -0500 Subject: [PATCH] Part of the patch from bug #4301; clean up our prototypes, a lot. Still plenty of work to do! --- h/prototypes.h | 15 +++++++++++++-- uip/ap.c | 5 ----- uip/dp.c | 5 ----- uip/mhbuild.c | 3 --- uip/mhbuildsbr.c | 1 - uip/mhcachesbr.c | 4 ---- uip/mhl.c | 3 --- uip/mhlist.c | 1 - uip/mhlsbr.c | 10 ---------- uip/mhmisc.c | 2 -- uip/mhn.c | 1 - uip/mhoutsbr.c | 1 - uip/mhparse.c | 4 ---- uip/mhshow.c | 1 - uip/mhshowsbr.c | 6 ------ uip/mhstore.c | 1 - uip/mhstoresbr.c | 1 - uip/mhtest.c | 1 - uip/msh.c | 2 -- uip/mshcmds.c | 10 ---------- uip/scansbr.c | 1 - uip/show.c | 3 --- uip/viamail.c | 6 ------ uip/whatnow.c | 3 --- uip/whatnowproc.c | 3 --- 25 files changed, 13 insertions(+), 80 deletions(-) diff --git a/h/prototypes.h b/h/prototypes.h index ad9a87e..935c593 100644 --- 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 *get_charset(); +char *get_charset(void); 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); +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 *); +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 SOprintf (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 a0f7f77..b0934fb 100644 --- a/uip/ap.c +++ b/uip/ap.c @@ -42,11 +42,6 @@ static struct format *fmt; static int dat[5]; /* - * prototypes - */ -int sc_width (void); /* from termsbr.c */ - -/* * static prototypes */ static int process (char *, int, int); diff --git a/uip/dp.c b/uip/dp.c index c94c8ea..4e9c5cb 100644 --- a/uip/dp.c +++ b/uip/dp.c @@ -37,11 +37,6 @@ static struct format *fmt; static int dat[5]; /* - * prototypes - */ -int sc_width (void); /* from termsbr.c */ - -/* * static prototypes */ static int process (char *, int); diff --git a/uip/mhbuild.c b/uip/mhbuild.c index d7a3cf0..ad674f4 100644 --- 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); -/* mhmisc.c */ -void set_endian (void); - /* mhfree.c */ void free_content (CT); diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index c349bf8..e791713 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -59,7 +59,6 @@ static char prefix[] = "----- =_aaaaaaaaaa"; /* mhmisc.c */ -int make_intermediates (char *); void content_error (char *, CT, char *, ...); /* mhcachesbr.c */ diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c index eee8631..2c18865 100644 --- a/uip/mhcachesbr.c +++ b/uip/mhcachesbr.c @@ -41,13 +41,9 @@ char *cache_public; char *cache_private; -/* mhparse.c (OR) mhbuildsbr.c */ -int pidcheck (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); diff --git a/uip/mhl.c b/uip/mhl.c index de12dde..490813d 100644 --- a/uip/mhl.c +++ b/uip/mhl.c @@ -9,9 +9,6 @@ #include -/* prototype from mhlsbr.c */ -int mhl (int, char **); - int main (int argc, char **argv) diff --git a/uip/mhlist.c b/uip/mhlist.c index 664be9f..312705a 100644 --- 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); -void set_endian (void); void flush_errors (void); /* mhlistsbr.c */ diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c index 68cb7f9..e961b9b 100644 --- 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 *); -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) diff --git a/uip/mhmisc.c b/uip/mhmisc.c index 7a23139..e8a30ac 100644 --- 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); -void set_endian (void); -int make_intermediates (char *); void content_error (char *, CT, char *, ...); void flush_errors (void); diff --git a/uip/mhn.c b/uip/mhn.c index 6a46ca5..3d8801e 100644 --- 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); -void set_endian (void); void flush_errors (void); /* mhshowsbr.c */ diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c index 72e7bd4..8324991 100644 --- 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 writeBase64aux (FILE *, FILE *); /* * static prototypes diff --git a/uip/mhparse.c b/uip/mhparse.c index 5b48483..e9a4cee 100644 --- 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); -int make_intermediates (char *); void content_error (char *, CT, char *, ...); /* mhfree.c */ diff --git a/uip/mhshow.c b/uip/mhshow.c index ea34914..eb9c412 100644 --- 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); -void set_endian (void); void flush_errors (void); /* mhshowsbr.c */ diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index 5abd67d..6bfc0bc 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -38,12 +38,6 @@ pid_t xpid = 0; 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); diff --git a/uip/mhstore.c b/uip/mhstore.c index 2646ba6..7814dd2 100644 --- 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); -void set_endian (void); void flush_errors (void); /* mhstoresbr.c */ diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c index 5962184..58ed5be 100644 --- 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); -int make_intermediates (char *); void flush_errors (void); /* mhshowsbr.c */ diff --git a/uip/mhtest.c b/uip/mhtest.c index cde45db..e5c4545 100644 --- 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); -void set_endian (void); void flush_errors (void); /* mhfree.c */ diff --git a/uip/msh.c b/uip/msh.c index 43530db..f6d1a36 100644 --- a/uip/msh.c +++ b/uip/msh.c @@ -153,8 +153,6 @@ int told_to_quit; /* SIGQUIT detected */ /* * 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); diff --git a/uip/mshcmds.c b/uip/mshcmds.c index 19d8b5b..9937a1d 100644 --- a/uip/mshcmds.c +++ b/uip/mshcmds.c @@ -33,13 +33,6 @@ static FILE *mhlfp; 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 int burst (struct Msg *, int, int, int, int); @@ -58,9 +51,6 @@ static int process (int, char *, int, char **); 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) { diff --git a/uip/scansbr.c b/uip/scansbr.c index ae347e8..835a884 100644 --- a/uip/scansbr.c +++ b/uip/scansbr.c @@ -56,7 +56,6 @@ char *scanl = 0; /* text of most recent scanline */ /* * prototypes */ -int sc_width (void); /* from termsbr.c */ static int mh_fputs(char *, FILE *); #ifdef MULTIBYTE_SUPPORT diff --git a/uip/show.c b/uip/show.c index a59e10c..1b11871 100644 --- a/uip/show.c +++ b/uip/show.c @@ -52,9 +52,6 @@ static struct swit switches[] = { */ static int is_nontext(char *); -/* prototype from mhlsbr.c */ -int mhl (int, char **); - #define SHOW 0 #define NEXT 1 #define PREV 2 diff --git a/uip/viamail.c b/uip/viamail.c index 49bbdf4..12412c7 100644 --- a/uip/viamail.c +++ b/uip/viamail.c @@ -52,12 +52,6 @@ extern int verbsw; int ebcdicsw = 0; /* hack for linking purposes */ -/* mhmisc.c */ -void set_endian (void); - -/* mhoutsbr.c */ -int writeBase64aux (FILE *, FILE *); - /* * static prototypes */ diff --git a/uip/whatnow.c b/uip/whatnow.c index d3fccfd..be50bc9 100644 --- a/uip/whatnow.c +++ b/uip/whatnow.c @@ -9,9 +9,6 @@ #include -/* from whatnowsbr.c */ -int WhatNow (int, char **); - int main (int argc, char **argv) diff --git a/uip/whatnowproc.c b/uip/whatnowproc.c index 6bf4b36..293d5ce 100644 --- a/uip/whatnowproc.c +++ b/uip/whatnowproc.c @@ -19,9 +19,6 @@ * 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, -- 1.7.10.4