X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Ffmtdump.c;h=fc94247c1880021d8e8147fc21121a35ec361685;hp=160daaffd46610de111d79917858eb411ad8b557;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=5b792c4424571f05bc2008e3109797d18d7d00d1

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 160daaf..fc94247 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
-	{ "version", 0 },
-#define HELPSW  3
+#define VERSIONSW  1
+	{ "Version", 0 },
+#define HELPSW  2
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -44,9 +42,8 @@ static void litputc(char);
 int
 main(int argc, char **argv)
 {
-	int ncomps;
-	char *cp, *form = NULL, *format = NULL;
-	char buf[BUFSIZ], *nfs, **argp, **arguments;
+	char *cp, *form = NULL;
+	char buf[BUFSIZ], *fmtstr, **argp, **arguments;
 	struct format *fmt;
 
 #ifdef LOCALE
@@ -82,13 +79,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,8 +92,8 @@ main(int argc, char **argv)
 	/*
 	** Get new format string.  Must be before chdir().
 	*/
-	nfs = new_fs(form, format, FORMAT);
-	ncomps = fmt_compile(nfs, &fmt);
+	fmtstr = new_fs(form, FORMAT);
+	fmt_compile(fmtstr, &fmt);
 
 	fmt_dump(fmt);
 	done(0);
@@ -412,9 +402,6 @@ f_typestr(int t)
 	case FT_PARSEADDR: return("PARSEADDR");
 	case FT_FORMATADDR: return("FORMATADDR");
 	case FT_MYMBOX: return("MYMBOX");
-#ifdef FT_ADDTOSEQ
-	case FT_ADDTOSEQ: return("ADDTOSEQ");
-#endif
 	case FT_SAVESTR: return("SAVESTR");
 #ifdef FT_PAUSE
 	case FT_PAUSE: return ("PAUSE");