(keymatch, configkeys): Move to from optlist.h to emp_config.c; static

linkage.

diff --git a/include/optlist.h b/include/optlist.h
index 05fe84de3823af16aa604c6759200cb06610547b..b117316a46e5fda730093a6a31e2d839aa0c1252 100644 (file)
--- a/include/optlist.h
+++ b/include/optlist.h
@@ -109,16 +109,4 @@ extern s_char *timestampfil;
 extern s_char *teldir;
 extern s_char *telfil;
 
-struct keymatch {
-    s_char *km_key;            /* the key */
-    void (*km_func)(struct keymatch * kp, s_char **av);
-                               /* the function to call if matches */
-    void *km_data;             /* associated data */
-    int km_flags;              /* useful flags */
-#define KM_ALLOC       0x01    /* memory allocated */
-    s_char *km_comment;                /* Comment (hopefully useful) */
-};
-
-extern struct keymatch configkeys[];
-
 #endif /* _OPTLIST_H_ */

diff --git a/src/lib/gen/emp_config.c b/src/lib/gen/emp_config.c
index 287a25a4431e8ed54a140e66e88d34954fe3e5ac..76536c953223a9c1e9ee1f01952c9f0cf5bdb081 100644 (file)
--- a/src/lib/gen/emp_config.c
+++ b/src/lib/gen/emp_config.c
@@ -60,6 +60,16 @@
 extern char *strdup();
 #endif /* NOSTRDUP */
 
+struct keymatch {
+    s_char *km_key;            /* the key */
+    void (*km_func)(struct keymatch * kp, s_char **av);
+                               /* the function to call if matches */
+    void *km_data;             /* associated data */
+    int km_flags;              /* useful flags */
+#define KM_ALLOC       0x01    /* memory allocated */
+    s_char *km_comment;                /* Comment (hopefully useful) */
+};
+
 /* Dummy one */
 static int emp_config_dummy;
 
@@ -73,7 +83,7 @@ static void optiondel(struct keymatch *kp, s_char **av);
 static void worldxset(struct keymatch *kp, s_char **av);
 
 /* things that can be changed */
-struct keymatch configkeys[] = {
+static struct keymatch configkeys[] = {
 #define        EMP_CONFIG_C_OUTPUT
 #include "econfig-spec.h"
 #undef EMP_CONFIG_C_OUTPUT