X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Frepl.c;h=b0956fcbd4b6667e6f616f4e7510ed4acffed132;hb=ee4f43cf2ef0084ec698e4e87159a94c01940622;hp=07ec48c0197532f4c74ffa7580f1dbd80096aa6d;hpb=bca1c9b36980c74f4dcc66a2d23e5d09083e0201;p=mmh

diff --git a/uip/repl.c b/uip/repl.c
index 07ec48c..b0956fc 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -47,20 +47,16 @@ static struct swit switches[] = {
 	{ "noquery", 0 },
 #define WHATSW  15
 	{ "whatnowproc program", 0 },
-#define NWHATSW  16
-	{ "nowhatnowproc", 0 },
-#define VERSIONSW  17
+#define VERSIONSW  16
 	{ "version", 0 },
-#define HELPSW  18
+#define HELPSW  17
 	{ "help", 0 },
-#define FILESW  19
+#define FILESW  18
 	{ "file file", 4 },  /* interface from msh */
-
 #ifdef MHE
-#define BILDSW  20
+# define BILDSW  19
 	{ "build", 5 },  /* interface from mhe */
 #endif
-
 	{ NULL, 0 }
 };
 
@@ -101,7 +97,7 @@ static int dftype=0;
 static char *badaddrs = NULL;
 static char *dfhost = NULL;
 
-static struct mailname mq = { NULL };
+static struct mailname mq;
 
 static struct format *fmt;
 
@@ -133,7 +129,7 @@ static char *addrcomps[] = {
 static void docc(char *, int);
 static int insert(struct mailname *);
 static void replfilter(FILE *, FILE *, char *);
-static void replout(FILE *, char *, char *, struct msgs *, int,
+static void replout(FILE *, char *, struct msgs *, int,
 		char *, char *);
 
 
@@ -141,7 +137,7 @@ int
 main(int argc, char **argv)
 {
 	int anot = 0;
-	int nedit = 0, nwhat = 0;
+	int nedit = 0;
 	char *cp, *cwd, *maildir, *file = NULL;
 	char *folder = NULL, *msg = NULL;
 	char *ed = NULL, drft[BUFSIZ], buf[BUFSIZ];
@@ -225,15 +221,12 @@ main(int argc, char **argv)
 						*whatnowproc == '-')
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				nwhat = 0;
 				continue;
 #ifdef MHE
 			case BILDSW:
 				buildsw++;  /* fall... */
-#endif /* MHE */
-			case NWHATSW:
-				nwhat++;
 				continue;
+#endif /* MHE */
 
 			case FILESW:
 				if (file)
@@ -360,10 +353,10 @@ main(int argc, char **argv)
 			form = etcpath(replcomps);
 	}
 
-	replout(in, msg, drft, mp, mime, form, filter);
+	replout(in, drft, mp, mime, form, filter);
 	fclose(in);
 
-	if (nwhat)
+	if (buildsw)
 		done(0);
 	what_now(ed, nedit, NOUSE, drft, msg, 0, mp, anot ? "Replied" : NULL,
 			cwd);
@@ -403,7 +396,7 @@ docc(char *cp, int ccflag)
 
 
 static void
-replout(FILE *inb, char *msg, char *drft, struct msgs *mp,
+replout(FILE *inb, char *drft, struct msgs *mp,
 	int mime, char *form, char *filter)
 {
 	register int state, i;