X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhtest.c;h=c7afd66deb6f5c92151e3cb78ca533755b97f61f;hp=7dc9c07d91d3da6319e7a44ac5f4aa2fab5872a1;hb=31dc797eb5178970d68962ca8939da3fd9a8efda;hpb=33dc8211a72df0c27fa11220f3b27583cd1c7e49 diff --git a/uip/mhtest.c b/uip/mhtest.c index 7dc9c07..c7afd66 100644 --- a/uip/mhtest.c +++ b/uip/mhtest.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -18,40 +17,28 @@ #include #include -#ifdef HAVE_SYS_WAIT_H -# include -#endif - static struct swit switches[] = { -#define CHECKSW 0 - { "check", 0 }, -#define NCHECKSW 1 - { "nocheck", 0 }, -#define VERBSW 2 +#define VERBSW 0 { "verbose", 0 }, -#define NVERBSW 3 +#define NVERBSW 1 { "noverbose", 0 }, -#define FILESW 4 +#define FILESW 2 { "file file", 0 }, -#define OUTFILESW 5 +#define OUTFILESW 3 { "outfile file", 0 }, -#define PARTSW 6 +#define PARTSW 4 { "part number", 0 }, -#define TYPESW 7 +#define TYPESW 5 { "type content", 0 }, -#define RCACHESW 8 +#define RCACHESW 6 { "rcache policy", 0 }, -#define WCACHESW 9 +#define WCACHESW 7 { "wcache policy", 0 }, -#define VERSIONSW 10 +#define VERSIONSW 8 { "version", 0 }, -#define HELPSW 11 +#define HELPSW 9 { "help", 0 }, - -/* -** switches for debugging -*/ -#define DEBUGSW 12 +#define DEBUGSW 10 { "debug", -5 }, { NULL, 0 } }; @@ -107,7 +94,7 @@ void freects_done(int) NORETURN; ** static prototypes */ static int write_content(CT *, char *); -static RETSIGTYPE pipeser(int); +static void pipeser(int); int @@ -174,13 +161,6 @@ do_cache: } continue; - case CHECKSW: - checksw++; - continue; - case NCHECKSW: - checksw = 0; - continue; - case PARTSW: if (!(cp = *argp++) || *cp == '-') adios(NULL, "missing argument to %s", argp[-2]); @@ -271,7 +251,7 @@ do_cache: adios(NULL, "out of memory"); ctp = cts; - if ((ct = parse_mime(file))); + if ((ct = parse_mime(file))) *ctp++ = ct; } else { /* @@ -378,7 +358,7 @@ write_content(CT *cts, char *outfile) } -static RETSIGTYPE +static void pipeser(int i) { if (i == SIGQUIT) {