X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/03fe41ba1d68108808c966c6d7ff74bd8c1d648c..b4f2851d4:/uip/conflict.c

diff --git a/uip/conflict.c b/uip/conflict.c
index a3bd1d7b..a43c70ee 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -26,17 +26,19 @@
  */
 #define	NGRPS	100
 
-static struct swit switches[] = {
-#define	MAILSW         0
-    { "mail name", 0 },
-#define	SERCHSW        1
-    { "search directory", 0 },
-#define VERSIONSW      2
-    { "version", 0 },
-#define	HELPSW         3
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define CONFLICT_SWITCHES \
+    X("mail name", 0, MAILSW) \
+    X("search directory", 0, SERCHSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(CONFLICT);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(CONFLICT, switches);
+#undef X
 
 static char *mail = NULL;
 static char *dirs[NDIRS];
@@ -92,10 +94,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [switches] [aliasfiles ...]",
 			invo_name);
 		    print_help (buf, switches, 0);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case MAILSW: 
 		    if (!(cp = *argp++) || *cp == '-')
@@ -364,7 +366,7 @@ setup (void)
 			close (fd);
 		    }
 		execlp (mailproc, r1bindex (mailproc, '/'),
-			mail, "-subject", invo_name, NULL);
+			mail, "-subject", invo_name, (void *) NULL);
 		adios (mailproc, "unable to exec ");
 
 	    default: