summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2022-03-13 01:02:37 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2022-03-13 01:02:37 +0000
commit583e0f48bddb011d05ca1a94bc90165cf32591b8 (patch)
tree2f27f48cf25d41a2dd73add5e441f29584b05a16
parent564960ff88ddf58b15acad60e3d5d06d84293c6a (diff)
TDB: quieten compiler and testsuite
-rw-r--r--src/src/dbfn.c8
-rw-r--r--src/src/exim_dbmbuild.c6
-rw-r--r--src/src/exim_dbutil.c8
-rw-r--r--src/src/lookups/dbmdb.c2
-rw-r--r--src/src/transports/autoreply.c6
-rwxr-xr-xtest/runtest1
6 files changed, 16 insertions, 15 deletions
diff --git a/src/src/dbfn.c b/src/src/dbfn.c
index c318c2f58..a9bc892d4 100644
--- 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_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;
@@ -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_DATA(key_datum) = CS key_copy;
+EXIM_DATUM_DATA(key_datum) = (void *) key_copy;
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);
}
@@ -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 */
-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);
}
diff --git a/src/src/exim_dbmbuild.c b/src/src/exim_dbmbuild.c
index ff7205d3d..73ca10e90 100644
--- 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);
- 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))
@@ -375,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. */
@@ -438,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))
diff --git a/src/src/exim_dbutil.c b/src/src/exim_dbutil.c
index 798f2fed6..c536a2037 100644
--- 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_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;
@@ -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_DATA(key_datum) = CS key_copy;
+EXIM_DATUM_DATA(key_datum) = (void *) key_copy;
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);
}
@@ -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 */
-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);
}
diff --git a/src/src/lookups/dbmdb.c b/src/src/lookups/dbmdb.c
index c607f7b9c..6db6dedb8 100644
--- 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_DATA(key) = CS keystring;
+EXIM_DATUM_DATA(key) = (void *) keystring;
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 217c54ccd..77e769450 100644
--- 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_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))
@@ -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_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_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);
}
diff --git a/test/runtest b/test/runtest
index f0fc25f75..a2e61442e 100755
--- 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)
+ | Using\ tdb
| Authenticators:
| Lookups(?:\(built-in\))?:
| Support\ for: