Remove attempts to quieten compiler static-checking

[users/heiko/exim.git] / src / src / lookups / cdb.c

diff --git a/src/src/lookups/cdb.c b/src/src/lookups/cdb.c
index c9a5de1d81554188a8eab4b5c5bc61d2077f7679..e0faa905d138a11a03a47c35f927fee2ab38199f 100644 (file)
--- a/src/src/lookups/cdb.c
+++ b/src/src/lookups/cdb.c
@@ -7,6 +7,7 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
  * Copyright (c) 1998 Nigel Metheringham, Planet Online Ltd
+ * Copyright (c) The Exim Maintainers 2020
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -264,7 +265,8 @@ return lf_check_file(cdbp->fileno, filename, S_IFREG, modemask,
 
 static int
 cdb_find(void * handle, const uschar * filename, const uschar * keystring,
-  int key_len, uschar ** result, uschar ** errmsg, uint * do_cache)
+  int key_len, uschar ** result, uschar ** errmsg, uint * do_cache,
+  const uschar * opts)
 {
 struct cdb_state * cdbp = handle;
 uint32 item_key_len,
@@ -279,9 +281,6 @@ hash_offset,
 hash_offlen,
 hash_slotnm;
 
-/* Keep picky compilers happy */
-do_cache = do_cache;
-
 key_hash = cdb_hash(keystring, key_len);
 
 hash_offset_entry = CDB_HASH_ENTRY * (key_hash & CDB_HASH_MASK);
@@ -479,15 +478,15 @@ fprintf(f, "Library version: CDB: Exim version %s\n", EXIM_VERSION_STR);
 
 
 lookup_info cdb_lookup_info = {
-  US"cdb",                       /* lookup name */
-  lookup_absfile,                /* uses absolute file name */
-  cdb_open,                      /* open function */
-  cdb_check,                     /* check function */
-  cdb_find,                      /* find function */
-  cdb_close,                     /* close function */
-  NULL,                          /* no tidy function */
-  NULL,                          /* no quoting function */
-  cdb_version_report             /* version reporting */
+  .name = US"cdb",                     /* lookup name */
+  .type = lookup_absfile,              /* absolute file name */
+  .open = cdb_open,                    /* open function */
+  .check = cdb_check,                  /* check function */
+  .find = cdb_find,                    /* find function */
+  .close = cdb_close,                  /* close function */
+  .tidy = NULL,                                /* no tidy function */
+  .quote = NULL,                       /* no quoting function */
+  .version_report = cdb_version_report             /* version reporting */
 };
 
 #ifdef DYNLOOKUP