Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / h / mhcachesbr.h

diff --git a/h/mhcachesbr.h b/h/mhcachesbr.h
index a197738444a27e23c1c38293b99e2d3ab870efaf..8f980a60998912d394d9ea425ac2b3e00e4cbed9 100644 (file)
--- a/h/mhcachesbr.h
+++ b/h/mhcachesbr.h
@@ -1,21 +1,22 @@
 
 /*
  * mhcachesbr.h -- definitions for manipulating MIME content cache
- *
- * $Id$
  */
 
 /*
  * various cache policies
  */
-static struct swit caches[] = {
-#define CACHE_NEVER    0
-    { "never", 0 },
-#define CACHE_PRIVATE  1
-    { "private", 0 },
-#define CACHE_PUBLIC   2
-    { "public", 0 },
-#define CACHE_ASK      3
-    { "ask", 0 },
-    { NULL, 0 }
-};
+
+#define CACHE_SWITCHES \
+    X("never", 0, CACHE_NEVER) \
+    X("private", 0, CACHE_PRIVATE) \
+    X("public", 0, CACHE_PUBLIC) \
+    X("ask", 0, CACHE_ASK) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(CACHE);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(CACHE, caches);
+#undef X