TDB: quieten compiler and testsuite

[exim.git] / src / src / exim_dbmbuild.c

diff --git a/src/src/exim_dbmbuild.c b/src/src/exim_dbmbuild.c
index 5a96f8a5966b924fe31957178d8821f72b2fe1ee..73ca10e90157134f0edf7550b62af69dcb9a8301 100644 (file)
--- a/src/src/exim_dbmbuild.c
+++ b/src/src/exim_dbmbuild.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 - 2021 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
@@ -41,10 +42,10 @@ uschar *
 readconf_printtime(int t)
 { return NULL; }
 void *
-store_get_3(int size, BOOL tainted, const char *filename, int linenumber)
+store_get_3(int size, const void * proto_mem, const char *filename, int linenumber)
 { return NULL; }
 void **
-store_reset_3(void **ptr, int pool, const char *filename, int linenumber)
+store_reset_3(void **ptr, const char *filename, int linenumber)
 { return NULL; }
 void
 store_release_above_3(void *ptr, const char *func, int linenumber)
@@ -69,6 +70,16 @@ struct global_flags  f;
 unsigned int           log_selector[1];
 uschar *               queue_name;
 BOOL                   split_spool_directory;
+
+
+/* These introduced by the taintwarn handling */
+rmark
+store_mark_3(const char *func, int linenumber)
+{ return NULL; }
+#ifdef ALLOW_INSECURE_TAINTED_DATA
+BOOL    allow_insecure_tainted_data;
+#endif
+
 /******************************************************************************/
 
 
@@ -337,7 +348,7 @@ while (Ufgets(line, max_insize, f) != NULL)
     if (started)
       {
       EXIM_DATUM_INIT(content);
-      EXIM_DATUM_DATA(content) = CS buffer;
+      EXIM_DATUM_DATA(content) = (void *) buffer;
       EXIM_DATUM_SIZE(content) = bptr - buffer + add_zero;
 
       switch(rc = EXIM_DBPUTB(d, key, content))
@@ -364,7 +375,7 @@ while (Ufgets(line, max_insize, f) != NULL)
       }
 
     EXIM_DATUM_INIT(key);
-    EXIM_DATUM_DATA(key) = CS keybuffer;
+    EXIM_DATUM_DATA(key) = (void *) keybuffer;
 
     /* Deal with quoted keys. Escape sequences always make one character
     out of several, so we can re-build in place. */
@@ -427,7 +438,7 @@ if (started)
   {
   int rc;
   EXIM_DATUM_INIT(content);
-  EXIM_DATUM_DATA(content) = CS buffer;
+  EXIM_DATUM_DATA(content) = (void *) buffer;
   EXIM_DATUM_SIZE(content) = bptr - buffer + add_zero;
 
   switch(rc = EXIM_DBPUTB(d, key, content))