TDB: quieten compiler and testsuite

diff --git a/src/src/dbfn.c b/src/src/dbfn.c
index c318c2f5893309433c9db2173f05199586c1e03a..a9bc892d4e9fd2c1edaab83610157932d0050331 100644 (file)
--- a/src/src/dbfn.c
+++ b/src/src/dbfn.c
@@ -276,7 +276,7 @@ DEBUG(D_hints_lookup) debug_printf_indent("dbfn_read: key=%s\n", key);
 
 EXIM_DATUM_INIT(key_datum);         /* Some DBM libraries require the datum */
 EXIM_DATUM_INIT(result_datum);      /* to be cleared before use. */
 
 EXIM_DATUM_INIT(key_datum);         /* Some DBM libraries require the datum */
 EXIM_DATUM_INIT(result_datum);      /* to be cleared before use. */

-EXIM_DATUM_DATA(key_datum) = CS key_copy;
+EXIM_DATUM_DATA(key_datum) = (void *) key_copy;

 EXIM_DATUM_SIZE(key_datum) = klen;
 
 if (!EXIM_DBGET(dbblock->dbptr, key_datum, result_datum)) return NULL;
 EXIM_DATUM_SIZE(key_datum) = klen;
 
 if (!EXIM_DBGET(dbblock->dbptr, key_datum, result_datum)) return NULL;


@@ -352,9 +352,9 @@ DEBUG(D_hints_lookup) debug_printf_indent("dbfn_write: key=%s\n", key);
 
 EXIM_DATUM_INIT(key_datum);         /* Some DBM libraries require the datum */
 EXIM_DATUM_INIT(value_datum);       /* to be cleared before use. */
 
 EXIM_DATUM_INIT(key_datum);         /* Some DBM libraries require the datum */
 EXIM_DATUM_INIT(value_datum);       /* to be cleared before use. */

-EXIM_DATUM_DATA(key_datum) = CS key_copy;
+EXIM_DATUM_DATA(key_datum) = (void *) key_copy;

 EXIM_DATUM_SIZE(key_datum) = klen;
 EXIM_DATUM_SIZE(key_datum) = klen;

-EXIM_DATUM_DATA(value_datum) = CS ptr;
+EXIM_DATUM_DATA(value_datum) = (void *) ptr;

 EXIM_DATUM_SIZE(value_datum) = length;
 return EXIM_DBPUT(dbblock->dbptr, key_datum, value_datum);
 }
 EXIM_DATUM_SIZE(value_datum) = length;
 return EXIM_DBPUT(dbblock->dbptr, key_datum, value_datum);
 }


@@ -384,7 +384,7 @@ DEBUG(D_hints_lookup) debug_printf_indent("dbfn_delete: key=%s\n", key);
 memcpy(key_copy, key, klen);
 EXIM_DATUM key_datum;
 EXIM_DATUM_INIT(key_datum);         /* Some DBM libraries require clearing */
 memcpy(key_copy, key, klen);
 EXIM_DATUM key_datum;
 EXIM_DATUM_INIT(key_datum);         /* Some DBM libraries require clearing */

-EXIM_DATUM_DATA(key_datum) = CS key_copy;
+EXIM_DATUM_DATA(key_datum) = (void *) key_copy;

 EXIM_DATUM_SIZE(key_datum) = klen;
 return EXIM_DBDEL(dbblock->dbptr, key_datum);
 }
 EXIM_DATUM_SIZE(key_datum) = klen;
 return EXIM_DBDEL(dbblock->dbptr, key_datum);
 }

diff --git a/src/src/exim_dbmbuild.c b/src/src/exim_dbmbuild.c
index ff7205d3d5e707b0264c317a230b3b089d353ba7..73ca10e90157134f0edf7550b62af69dcb9a8301 100644 (file)
--- a/src/src/exim_dbmbuild.c
+++ b/src/src/exim_dbmbuild.c
@@ -348,7 +348,7 @@ while (Ufgets(line, max_insize, f) != NULL)
     if (started)
       {
       EXIM_DATUM_INIT(content);
     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))
       EXIM_DATUM_SIZE(content) = bptr - buffer + add_zero;
 
       switch(rc = EXIM_DBPUTB(d, key, content))


@@ -375,7 +375,7 @@ while (Ufgets(line, max_insize, f) != NULL)
       }
 
     EXIM_DATUM_INIT(key);
       }
 
     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. */
 
     /* Deal with quoted keys. Escape sequences always make one character
     out of several, so we can re-build in place. */


@@ -438,7 +438,7 @@ if (started)
   {
   int rc;
   EXIM_DATUM_INIT(content);
   {
   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))
   EXIM_DATUM_SIZE(content) = bptr - buffer + add_zero;
 
   switch(rc = EXIM_DBPUTB(d, key, content))

diff --git a/src/src/exim_dbutil.c b/src/src/exim_dbutil.c
index 798f2fed6e520fe3d39bb13b61bc13a6b00420c2..c536a20375df7af50e83490f664af7f5a9b8ecf9 100644 (file)
--- a/src/src/exim_dbutil.c
+++ b/src/src/exim_dbutil.c
@@ -436,7 +436,7 @@ memcpy(key_copy, key, klen);
 
 EXIM_DATUM_INIT(key_datum);         /* Some DBM libraries require the datum */
 EXIM_DATUM_INIT(result_datum);      /* to be cleared before use. */
 
 EXIM_DATUM_INIT(key_datum);         /* Some DBM libraries require the datum */
 EXIM_DATUM_INIT(result_datum);      /* to be cleared before use. */

-EXIM_DATUM_DATA(key_datum) = CS key_copy;
+EXIM_DATUM_DATA(key_datum) = (void *) key_copy;

 EXIM_DATUM_SIZE(key_datum) = klen;
 
 if (!EXIM_DBGET(dbblock->dbptr, key_datum, result_datum)) return NULL;
 EXIM_DATUM_SIZE(key_datum) = klen;
 
 if (!EXIM_DBGET(dbblock->dbptr, key_datum, result_datum)) return NULL;


@@ -484,9 +484,9 @@ gptr->time_stamp = time(NULL);
 
 EXIM_DATUM_INIT(key_datum);         /* Some DBM libraries require the datum */
 EXIM_DATUM_INIT(value_datum);       /* to be cleared before use. */
 
 EXIM_DATUM_INIT(key_datum);         /* Some DBM libraries require the datum */
 EXIM_DATUM_INIT(value_datum);       /* to be cleared before use. */

-EXIM_DATUM_DATA(key_datum) = CS key_copy;
+EXIM_DATUM_DATA(key_datum) = (void *) key_copy;

 EXIM_DATUM_SIZE(key_datum) = klen;
 EXIM_DATUM_SIZE(key_datum) = klen;

-EXIM_DATUM_DATA(value_datum) = CS ptr;
+EXIM_DATUM_DATA(value_datum) = (void *) ptr;

 EXIM_DATUM_SIZE(value_datum) = length;
 return EXIM_DBPUT(dbblock->dbptr, key_datum, value_datum);
 }
 EXIM_DATUM_SIZE(value_datum) = length;
 return EXIM_DBPUT(dbblock->dbptr, key_datum, value_datum);
 }


@@ -514,7 +514,7 @@ uschar * key_copy = store_get(klen, key);
 memcpy(key_copy, key, klen);
 EXIM_DATUM key_datum;
 EXIM_DATUM_INIT(key_datum);         /* Some DBM libraries require clearing */
 memcpy(key_copy, key, klen);
 EXIM_DATUM key_datum;
 EXIM_DATUM_INIT(key_datum);         /* Some DBM libraries require clearing */

-EXIM_DATUM_DATA(key_datum) = CS key_copy;
+EXIM_DATUM_DATA(key_datum) = (void *) key_copy;

 EXIM_DATUM_SIZE(key_datum) = klen;
 return EXIM_DBDEL(dbblock->dbptr, key_datum);
 }
 EXIM_DATUM_SIZE(key_datum) = klen;
 return EXIM_DBDEL(dbblock->dbptr, key_datum);
 }

diff --git a/src/src/lookups/dbmdb.c b/src/src/lookups/dbmdb.c
index c607f7b9c50cb6be3520c48904169c6598abfd06..6db6dedb89e4efad3a2f48e832f889123faa40e7 100644 (file)
--- a/src/src/lookups/dbmdb.c
+++ b/src/src/lookups/dbmdb.c
@@ -95,7 +95,7 @@ EXIM_DATUM key, data;
 
 EXIM_DATUM_INIT(key);               /* Some DBM libraries require datums to */
 EXIM_DATUM_INIT(data);              /* be cleared before use. */
 
 EXIM_DATUM_INIT(key);               /* Some DBM libraries require datums to */
 EXIM_DATUM_INIT(data);              /* be cleared before use. */

-EXIM_DATUM_DATA(key) = CS keystring;
+EXIM_DATUM_DATA(key) = (void *) keystring;

 EXIM_DATUM_SIZE(key) = length + 1;
 
 if (EXIM_DBGET(d, key, data))
 EXIM_DATUM_SIZE(key) = length + 1;
 
 if (EXIM_DBGET(d, key, data))

diff --git a/src/src/transports/autoreply.c b/src/src/transports/autoreply.c
index 217c54ccd2a912d71704dbf02f99a0bdf3ca04d8..77e769450bfc224a81ef4a86e9f1f467920bc388 100644 (file)
--- a/src/src/transports/autoreply.c
+++ b/src/src/transports/autoreply.c
@@ -489,7 +489,7 @@ if (oncelog && *oncelog && to)
 
     EXIM_DATUM_INIT(key_datum);        /* Some DBM libraries need datums */
     EXIM_DATUM_INIT(result_datum);     /* to be cleared */
 
     EXIM_DATUM_INIT(key_datum);        /* Some DBM libraries need datums */
     EXIM_DATUM_INIT(result_datum);     /* to be cleared */

-    EXIM_DATUM_DATA(key_datum) = CS to;
+    EXIM_DATUM_DATA(key_datum) = (void *) to;

     EXIM_DATUM_SIZE(key_datum) = Ustrlen(to) + 1;
 
     if (EXIM_DBGET(dbm_file, key_datum, result_datum))
     EXIM_DATUM_SIZE(key_datum) = Ustrlen(to) + 1;
 
     if (EXIM_DBGET(dbm_file, key_datum, result_datum))


@@ -740,14 +740,14 @@ else if (dbm_file)
   EXIM_DATUM key_datum, value_datum;
   EXIM_DATUM_INIT(key_datum);          /* Some DBM libraries need to have */
   EXIM_DATUM_INIT(value_datum);        /* cleared datums. */
   EXIM_DATUM key_datum, value_datum;
   EXIM_DATUM_INIT(key_datum);          /* Some DBM libraries need to have */
   EXIM_DATUM_INIT(value_datum);        /* cleared datums. */

-  EXIM_DATUM_DATA(key_datum) = CS to;
+  EXIM_DATUM_DATA(key_datum) = (void *) to;

   EXIM_DATUM_SIZE(key_datum) = Ustrlen(to) + 1;
 
   /* Many OS define the datum value, sensibly, as a void *. However, there
   are some which still have char *. By casting this address to a char * we
   can avoid warning messages from the char * systems. */
 
   EXIM_DATUM_SIZE(key_datum) = Ustrlen(to) + 1;
 
   /* Many OS define the datum value, sensibly, as a void *. However, there
   are some which still have char *. By casting this address to a char * we
   can avoid warning messages from the char * systems. */
 

-  EXIM_DATUM_DATA(value_datum) = CS (&now);
+  EXIM_DATUM_DATA(value_datum) = (void *) &now;

   EXIM_DATUM_SIZE(value_datum) = (int)sizeof(time_t);
   EXIM_DBPUT(dbm_file, key_datum, value_datum);
   }
   EXIM_DATUM_SIZE(value_datum) = (int)sizeof(time_t);
   EXIM_DBPUT(dbm_file, key_datum, value_datum);
   }

diff --git a/test/runtest b/test/runtest
index f0fc25f75e5ad74e85e2e9d924f574a866e4eca7..a2e61442e49ba818bb09c57cd7ce81767952de70 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1454,6 +1454,7 @@ RESET_AFTER_EXTRA_LINE_READ:
       next if /^$time_pid?
                  (?: Berkeley\ DB:\s
                    | Probably\ (?:Berkeley\ DB|ndbm|GDBM)
       next if /^$time_pid?
                  (?: Berkeley\ DB:\s
                    | Probably\ (?:Berkeley\ DB|ndbm|GDBM)

+                   | Using\ tdb

                    | Authenticators:
                    | Lookups(?:\(built-in\))?:
                    | Support\ for:
                    | Authenticators:
                    | Lookups(?:\(built-in\))?:
                    | Support\ for: