X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Ffmtdump.c;h=923a46e99fa90550926daaf8fbd4f2d450c9ed69;hp=75ac4c21a4ed5da8a2a31214689c2f90ea4d4802;hb=f51956be123db66b00138f80464d06f030dbb88d;hpb=84c6039eb7226c0ba0a8f708205e33d10950d2ae

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 75ac4c2..923a46e 100644
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -14,11 +14,9 @@
 static struct swit switches[] = {
 #define FORMSW  0
 	{ "form formatfile", 0 },
-#define FMTSW  1
-	{ "format string", 5 },
-#define VERSIONSW  2
+#define VERSIONSW  1
 	{ "version", 0 },
-#define HELPSW  3
+#define HELPSW  2
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -45,7 +43,7 @@ int
 main(int argc, char **argv)
 {
 	int ncomps;
-	char *cp, *form = NULL, *format = NULL;
+	char *cp, *form = NULL;
 	char buf[BUFSIZ], *nfs, **argp, **arguments;
 	struct format *fmt;
 
@@ -82,13 +80,6 @@ main(int argc, char **argv)
 				if (!(form = *argp++) || *form == '-')
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				format = NULL;
-				continue;
-			case FMTSW:
-				if (!(format = *argp++) || *format == '-')
-					adios(NULL, "missing argument to %s",
-							argp[-2]);
-				form = NULL;
 				continue;
 
 			}
@@ -102,7 +93,7 @@ main(int argc, char **argv)
 	/*
 	** Get new format string.  Must be before chdir().
 	*/
-	nfs = new_fs(form, format, NULL, FORMAT);
+	nfs = new_fs(form, FORMAT);
 	ncomps = fmt_compile(nfs, &fmt);
 
 	fmt_dump(fmt);