More code converted to use argsplit().

[nmh] / uip / new.c

diff --git a/uip/new.c b/uip/new.c
index 91991e1b6a580e31198c730f34bf3d6716da91c5..e391ba200d5b57caaaf6aa92e1d6f92113047151 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -21,17 +21,19 @@
 #include <h/crawl_folders.h>
 #include <h/utils.h>
 
 #include <h/crawl_folders.h>
 #include <h/utils.h>
 

-static struct swit switches[] = {
-#define MODESW 0
-    { "mode", 1 },
-#define FOLDERSSW 1
-    { "folders", 1 },
-#define VERSIONSW 2
-    { "version", 1 },
-#define HELPSW 3
-    { "help", 1 },
-    { NULL, 0 }
-};
+#define NEW_SWITCHES \
+    X("mode", 1, MODESW) \
+    X("folders", 1, FOLDERSSW) \
+    X("version", 1, VERSIONSW) \
+    X("help", 1, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(NEW);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(NEW, switches);
+#undef X

 
 static enum { NEW, FNEXT, FPREV, UNSEEN } run_mode = NEW;
 
 
 static enum { NEW, FNEXT, FPREV, UNSEEN } run_mode = NEW;