Switch from using RETSIGTYPE via autoconf to void.

[mmh] / uip / mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 0baf198..4a07d01 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -18,10 +18,6 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 static struct swit switches[] = {
 #define CHECKSW  0
        { "check", 0 },
@@ -52,18 +48,9 @@ static struct swit switches[] = {
 #define HELPSW  13
        { "help", 0 },
 /*
-** switches for moreproc/mhlproc
-*/
-#define PROGSW  14
-       { "moreproc program", -4 },
-#define LENSW  15
-       { "length lines", -4 },
-#define WIDTHSW  16
-       { "width columns", -4 },
-/*
 ** switches for debugging
 */
-#define DEBUGSW  17
+#define DEBUGSW  14
        { "debug", -5 },
        { NULL, 0 }
 };
@@ -80,7 +67,6 @@ extern char *cache_private;
 
 /* mhshowsbr.c */
 extern int serialsw;
-extern char *progsw;
 extern int nolist;
 extern char *formsw;
 
@@ -116,7 +102,7 @@ void freects_done(int) NORETURN;
 /*
 ** static prototypes
 */
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
 
 
 int
@@ -232,22 +218,6 @@ do_cache:
                                formsw = getcpy(etcpath(cp));
                                continue;
 
-                       /*
-                       ** Switches for moreproc/mhlproc
-                       */
-                       case PROGSW:
-                               if (!(progsw = *argp++) || *progsw == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               continue;
-
-                       case LENSW:
-                       case WIDTHSW:
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               continue;
-
                        case VERBSW:
                                verbosw = 1;
                                continue;
@@ -329,7 +299,7 @@ do_cache:
                        adios(NULL, "out of memory");
                ctp = cts;
 
-               if ((ct = parse_mime(file)));
+               if ((ct = parse_mime(file)))
                        *ctp++ = ct;
        } else {
                /*
@@ -435,7 +405,7 @@ do_cache:
 }
 
 
-static RETSIGTYPE
+static void
 pipeser(int i)
 {
        if (i == SIGQUIT) {