X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/df215b409be636447d5ae80dc20eace0a6ada1b8..25b5d3aa852eb145beea1d3abcbe57e75f2e59a7:/uip/ali.c

diff --git a/uip/ali.c b/uip/ali.c
index e9a63fda..3893a1d8 100644
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -13,29 +13,25 @@
 #include <h/mts.h>
 #include <h/utils.h>
 
-static struct swit switches[] = {
-#define	ALIASW                0
-    { "alias aliasfile", 0 },
-#define	NALIASW               1
-    { "noalias", -7 },
-#define	LISTSW                2
-    { "list", 0 },
-#define	NLISTSW               3
-    { "nolist", 0 },
-#define	NORMSW                4
-    { "normalize", 0 },
-#define	NNORMSW               5
-    { "nonormalize", 0 },
-#define	USERSW                6
-    { "user", 0 },
-#define	NUSERSW               7
-    { "nouser", 0 },
-#define VERSIONSW             8
-    { "version", 0 },
-#define	HELPSW                9
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define ALI_SWITCHES \
+    X("alias aliasfile", 0, ALIASW) \
+    X("noalias", -7, NALIASW) \
+    X("list", 0, LISTSW) \
+    X("nolist", 0, NLISTSW) \
+    X("normalize", 0, NORMSW) \
+    X("nonormalize", 0, NNORMSW) \
+    X("user", 0, USERSW) \
+    X("nouser", 0, NUSERSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(ALI);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(ALI, switches);
+#undef X
 
 static int pos = 1;
 
@@ -249,12 +245,7 @@ print_usr (char *s, int list, int norm)
     }
     mnfree (mp);
 
-#if 0
-    printf ("%s: ", s);
-    print_aka (vp ? vp : s, list, pos += strlen (s) + 1);
-#else
     print_aka (vp ? vp : s, list, 0);
-#endif
 
     if (vp)
 	free (vp);