X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/05dcfac6f90b695d4e238f9f15fab1cb5d011967..3c03f5572c03f41c268ec045bbd4a4d39afb80b1:/lib/configuration.c

diff --git a/lib/configuration.c b/lib/configuration.c
index 5c1d4ce..c66f66b 100644
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -22,12 +22,8 @@
  * @brief Configuration file support
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -311,7 +307,7 @@ static int set_restrict(const struct config_state *cs,
   };
 
   for(n = 0; n < nvec; ++n) {
-    if((i = TABLE_FIND(restrictions, struct restriction, name, vec[n])) < 0) {
+    if((i = TABLE_FIND(restrictions, name, vec[n])) < 0) {
       error(0, "%s:%d: invalid restriction '%s'",
 	    cs->path, cs->line, vec[n]);
       return -1;
@@ -986,7 +982,7 @@ static const struct conf conf[] = {
 static const struct conf *find(const char *key) {
   int n;
 
-  if((n = TABLE_FIND(conf, struct conf, name, key)) < 0)
+  if((n = TABLE_FIND(conf, name, key)) < 0)
     return 0;
   return &conf[n];
 }