TABLE_FIND() now uses typeof. We're committed to GCC anyway so it

[disorder] / lib / configuration.c

diff --git a/lib/configuration.c b/lib/configuration.c
index 5c1d4cef429720f80472dc07bf944929fda9d9f0..ca7d86e7dd4cc22d2d7b6e993616f61ac4d72096 100644 (file)
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -311,7 +311,7 @@ static int set_restrict(const struct config_state *cs,
   };
 
   for(n = 0; n < nvec; ++n) {
   };
 
   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;
       error(0, "%s:%d: invalid restriction '%s'",
            cs->path, cs->line, vec[n]);
       return -1;


@@ -986,7 +986,7 @@ static const struct conf conf[] = {
 static const struct conf *find(const char *key) {
   int n;
 
 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];
 }
     return 0;
   return &conf[n];
 }