From 56af4115c72d0ee03d7492390156211b2d18ffcb Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Sat, 18 Jul 2020 12:55:23 -0400
Subject: Reverse order of X macro parameters for pages and keys

---
 server.c |  4 ++--
 server.h | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/server.c b/server.c
index 8aea1e5..48b760c 100644
--- a/server.c
+++ b/server.c
@@ -40,13 +40,13 @@ static void finalizeAll(void) {
 }
 
 const char *Pages[PagesLen] = {
-#define X(page, path) [page] = path,
+#define X(path, page) [page] = path,
 	ENUM_PAGES
 #undef X
 };
 
 const struct kvalid Keys[KeysLen] = {
-#define X(key, name, valid) [key] = { valid, name },
+#define X(valid, name, key) [key] = { valid, name },
 	ENUM_KEYS
 #undef X
 };
diff --git a/server.h b/server.h
index 504a6f6..bd39526 100644
--- a/server.h
+++ b/server.h
@@ -31,16 +31,16 @@
 #define SQL(...) #__VA_ARGS__
 
 #define ENUM_PAGES \
-	X(Networks, "networks") \
-	X(Contexts, "contexts") \
-	X(Events, "events") \
-	X(Search, "search") \
-	X(Stylesheet, "stylesheet")
+	X("networks", Networks) \
+	X("contexts", Contexts) \
+	X("events", Events) \
+	X("search", Search) \
+	X("stylesheet", Stylesheet)
 
 extern const char *CSS;
 
 enum {
-#define X(page, path) page,
+#define X(path, page) page,
 	ENUM_PAGES
 #undef X
 	PagesLen,
@@ -48,17 +48,17 @@ enum {
 extern const char *Pages[PagesLen];
 
 #define ENUM_KEYS \
-	X(Network, "network", kvalid_stringne) \
-	X(Context, "context", kvalid_stringne) \
-	X(After, "after", kvalid_stringne) \
-	X(Before, "before", kvalid_stringne) \
-	X(Tidy, "tidy", kvalid_int) \
-	X(Query, "query", kvalid_stringne) \
-	X(Offset, "offset", kvalid_int) \
-	X(Export, "export", NULL)
+	X(kvalid_stringne, "network", Network) \
+	X(kvalid_stringne, "context", Context) \
+	X(kvalid_stringne, "before", Before) \
+	X(kvalid_stringne, "after", After) \
+	X(kvalid_stringne, "query", Query) \
+	X(kvalid_int, "offset", Offset) \
+	X(kvalid_int, "tidy", Tidy) \
+	X(NULL, "export", Export)
 
 enum Key {
-#define X(key, name, valid) key,
+#define X(valid, name, key) key,
 	ENUM_KEYS
 #undef X
 	KeysLen,
-- 
cgit 1.4.1