Remove attempts to quieten compiler static-checking

[exim.git] / src / src / lookups / ibase.c

diff --git a/src/src/lookups/ibase.c b/src/src/lookups/ibase.c
index 2ccb7b4f177c190f95fd922715d5162fe292848e..4789b6cb7a54c563ea97580cc2ab74e71f12e9e6 100644 (file)
--- a/src/src/lookups/ibase.c
+++ b/src/src/lookups/ibase.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* The code in this module was contributed by Ard Biesheuvel. */
@@ -451,20 +452,16 @@ deferred with a retryable error. */
 
 static int
 ibase_find(void * handle, const uschar * filename, uschar * query, int length,
-           uschar ** result, uschar ** errmsg, uint *do_cache)
+  uschar ** result, uschar ** errmsg, uint * do_cache, const uschar * opts)
 {
 int sep = 0;
 uschar *server;
 uschar *list = ibase_servers;
 uschar buffer[512];
 
-/* Keep picky compilers happy */
-do_cache = do_cache;
-
 DEBUG(D_lookup) debug_printf_indent("Interbase query: %s\n", query);
 
-while ((server = string_nextinlist(&list, &sep, buffer,
-                         sizeof(buffer))))
+while ((server = string_nextinlist(&list, &sep, buffer, sizeof(buffer))))
   {
   BOOL defer_break = FALSE;
   int rc = perform_ibase_search(query, server, result, errmsg, &defer_break);
@@ -562,15 +559,15 @@ fprintf(f, "Library version: ibase: Exim version %s\n", EXIM_VERSION_STR);
 
 
 static lookup_info _lookup_info = {
-  US"ibase",                     /* lookup name */
-  lookup_querystyle,             /* query-style lookup */
-  ibase_open,                    /* open function */
-  NULL,                          /* no check function */
-  ibase_find,                    /* find function */
-  NULL,                          /* no close function */
-  ibase_tidy,                    /* tidy function */
-  ibase_quote,                   /* quoting function */
-  ibase_version_report           /* version reporting */
+  .name = US"ibase",                   /* lookup name */
+  .type = lookup_querystyle,           /* query-style lookup */
+  .open = ibase_open,                  /* open function */
+  .check NULL,                         /* no check function */
+  .find = ibase_find,                  /* find function */
+  .close = NULL,                       /* no close function */
+  .tidy = ibase_tidy,                  /* tidy function */
+  .quote = ibase_quote,                        /* quoting function */
+  .version_report = ibase_version_report           /* version reporting */
 };
 
 #ifdef DYNLOOKUP