Removed some dead code, all inside #if 0's. I tried to not remove

[mmh] / uip / mhtest.c

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 985147c..cbaefd3 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -2,8 +2,6 @@
 /*
  * mhtest.c -- test harness for MIME routines
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -22,10 +20,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 },
@@ -64,7 +58,6 @@ static struct swit switches[] = {
 int ebcdicsw = 0;      /* hack for linking purposes */
 
 /* mhparse.c */
-extern int checksw;
 extern char *tmp;      /* directory to place temp files */
 
 /* mhcachesbr.c */
@@ -89,9 +82,6 @@ pid_t xpid  = 0;
 int debugsw = 0;
 int verbosw = 0;
 
-/* The list of top-level contents to display */
-CT *cts = NULL;
-
 #define        quitser pipeser
 
 /* mhparse.c */
@@ -103,18 +93,18 @@ 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 */
 void free_content (CT);
+extern CT *cts;
+void freects_done (int) NORETURN;
 
 /*
  * static prototypes
  */
 static int write_content (CT *, char *);
-static RETSIGTYPE pipeser (int);
-static int freectp_done (int);
+static void pipeser (int);
 
 
 int
@@ -128,7 +118,7 @@ main (int argc, char **argv)
     struct msgs *mp = NULL;
     CT ct, *ctp;
 
-    done=freectp_done;
+    done=freects_done;
 
 #ifdef LOCALE
     setlocale(LC_ALL, "");
@@ -157,10 +147,10 @@ main (int argc, char **argv)
                snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]",
                        invo_name);
                print_help (buf, switches, 1);
-               done (1);
+               done (0);
            case VERSIONSW:
                print_version(invo_name);
-               done (1);
+               done (0);
 
            case RCACHESW:
                icachesw = &rcachesw;
@@ -242,8 +232,6 @@ do_cache:
     parts[npart] = NULL;
     types[ntype] = NULL;
 
-    set_endian ();
-
     if (outfile == NULL)
        adios (NULL, "must specify output file");
 
@@ -280,7 +268,7 @@ do_cache:
            adios (NULL, "out of memory");
        ctp = cts;
 
-       if ((ct = parse_mime (file)));
+       if ((ct = parse_mime (file)))
            *ctp++ = ct;
     } else {
        /*
@@ -366,7 +354,8 @@ do_cache:
        context_save ();                  /* save the context file  */
     }
 
-    return done (0);
+    done (0);
+    return 1;
 }
 
 
@@ -385,7 +374,7 @@ write_content (CT *cts, char *outfile)
 }
 
 
-static RETSIGTYPE
+static void
 pipeser (int i)
 {
     if (i == SIGQUIT) {
@@ -398,17 +387,3 @@ pipeser (int i)
     done (1);
     /* NOTREACHED */
 }
-
-
-static int
-freectp_done (int status)
-{
-    CT *ctp;
-
-    if ((ctp = cts))
-       for (; *ctp; ctp++)
-           free_content (*ctp);
-
-    exit (status);
-    return 1;  /* dead code to satisfy the compiler */
-}