summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/tdb/test/external-agent.c2
-rw-r--r--lib/tdb/test/run-3G-file.c4
-rw-r--r--lib/tdb/test/run-check.c4
-rw-r--r--lib/tdb/test/run-corrupt.c4
-rw-r--r--lib/tdb/test/run-die-during-transaction.c2
-rw-r--r--lib/tdb/test/run-endian.c6
-rw-r--r--lib/tdb/test/run-incompatible.c6
-rw-r--r--lib/tdb/test/run-nested-transactions.c4
-rw-r--r--lib/tdb/test/run-nested-traverse.c4
-rw-r--r--lib/tdb/test/run-no-lock-during-traverse.c2
-rw-r--r--lib/tdb/test/run-open-during-transaction.c4
-rw-r--r--lib/tdb/test/run-readonly-check.c4
-rw-r--r--lib/tdb/test/run-rescue.c6
-rw-r--r--lib/tdb/test/run-transaction-expand.c2
-rw-r--r--lib/tdb/test/run-traverse-in-transaction.c4
-rw-r--r--lib/tdb/test/run-wronghash-fail.c2
-rw-r--r--lib/tdb/test/run-zero-append.c4
-rw-r--r--lib/tdb/test/run.c4
18 files changed, 34 insertions, 34 deletions
diff --git a/lib/tdb/test/external-agent.c b/lib/tdb/test/external-agent.c
index 8140e70ead..8710b47832 100644
--- a/lib/tdb/test/external-agent.c
+++ b/lib/tdb/test/external-agent.c
@@ -27,7 +27,7 @@ static enum agent_return do_operation(enum operation op, const char *name)
return OTHER_FAILURE;
}
- k.dptr = (void *)name;
+ k.dptr = discard_const_p(uint8_t, name);
k.dsize = strlen(name);
locking_would_block = 0;
diff --git a/lib/tdb/test/run-3G-file.c b/lib/tdb/test/run-3G-file.c
index f21544a6af..67fd54f54f 100644
--- a/lib/tdb/test/run-3G-file.c
+++ b/lib/tdb/test/run-3G-file.c
@@ -79,9 +79,9 @@ int main(int argc, char *argv[])
tdb->methods = &large_io_methods;
key.dsize = strlen("hi");
- key.dptr = (void *)"hi";
+ key.dptr = discard_const_p(uint8_t, "hi");
orig_data.dsize = strlen("world");
- orig_data.dptr = (void *)"world";
+ orig_data.dptr = discard_const_p(uint8_t, "world");
/* Enlarge the file (internally multiplies by 2). */
ret = tdb_expand(tdb, 1500000000);
diff --git a/lib/tdb/test/run-check.c b/lib/tdb/test/run-check.c
index 05f7aecd08..b275691483 100644
--- a/lib/tdb/test/run-check.c
+++ b/lib/tdb/test/run-check.c
@@ -26,9 +26,9 @@ int main(int argc, char *argv[])
ok1(tdb_check(tdb, NULL, NULL) == 0);
key.dsize = strlen("hi");
- key.dptr = (void *)"hi";
+ key.dptr = discard_const_p(uint8_t, "hi");
data.dsize = strlen("world");
- data.dptr = (void *)"world";
+ data.dptr = discard_const_p(uint8_t, "world");
ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
ok1(tdb_check(tdb, NULL, NULL) == 0);
diff --git a/lib/tdb/test/run-corrupt.c b/lib/tdb/test/run-corrupt.c
index 1a3c769183..93eae42ce1 100644
--- a/lib/tdb/test/run-corrupt.c
+++ b/lib/tdb/test/run-corrupt.c
@@ -60,9 +60,9 @@ static void check_test(struct tdb_context *tdb)
ok1(tdb_check(tdb, NULL, NULL) == 0);
- key.dptr = (void *)"hello";
+ key.dptr = discard_const_p(uint8_t, "hello");
data.dsize = strlen("world");
- data.dptr = (void *)"world";
+ data.dptr = discard_const_p(uint8_t, "world");
/* Key and data size respectively. */
dsize = ksize = 0;
diff --git a/lib/tdb/test/run-die-during-transaction.c b/lib/tdb/test/run-die-during-transaction.c
index 6e3a70d4ae..9b9041552e 100644
--- a/lib/tdb/test/run-die-during-transaction.c
+++ b/lib/tdb/test/run-die-during-transaction.c
@@ -156,7 +156,7 @@ reset:
/* Put key for agent to fetch. */
key.dsize = strlen(KEY_STRING);
- key.dptr = (void *)KEY_STRING;
+ key.dptr = discard_const_p(uint8_t, KEY_STRING);
if (tdb_store(tdb, key, key, TDB_INSERT) != 0)
return false;
diff --git a/lib/tdb/test/run-endian.c b/lib/tdb/test/run-endian.c
index b19ffd373f..3116f7da51 100644
--- a/lib/tdb/test/run-endian.c
+++ b/lib/tdb/test/run-endian.c
@@ -25,9 +25,9 @@ int main(int argc, char *argv[])
ok1(tdb);
key.dsize = strlen("hi");
- key.dptr = (void *)"hi";
+ key.dptr = discard_const_p(uint8_t, "hi");
data.dsize = strlen("world");
- data.dptr = (void *)"world";
+ data.dptr = discard_const_p(uint8_t, "world");
ok1(tdb_store(tdb, key, data, TDB_MODIFY) < 0);
ok1(tdb_error(tdb) == TDB_ERR_NOEXIST);
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
ok1(tdb);
key.dsize = strlen("hi");
- key.dptr = (void *)"hi";
+ key.dptr = discard_const_p(uint8_t, "hi");
data = tdb_fetch(tdb, key);
ok1(data.dsize == strlen("world"));
ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
diff --git a/lib/tdb/test/run-incompatible.c b/lib/tdb/test/run-incompatible.c
index 628927c886..af01ca6a39 100644
--- a/lib/tdb/test/run-incompatible.c
+++ b/lib/tdb/test/run-incompatible.c
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
NULL);
ok1(tdb);
ok1(log_count == 0);
- d.dptr = (void *)"Hello";
+ d.dptr = discard_const_p(uint8_t, "Hello");
d.dsize = 5;
ok1(tdb_store(tdb, d, d, TDB_INSERT) == 0);
tdb_close(tdb);
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
NULL);
ok1(tdb);
ok1(log_count == 0);
- d.dptr = (void *)"Hello";
+ d.dptr = discard_const_p(uint8_t, "Hello");
d.dsize = 5;
ok1(tdb_store(tdb, d, d, TDB_INSERT) == 0);
tdb_close(tdb);
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
tdb_dumb_hash);
ok1(tdb);
ok1(log_count == 0);
- d.dptr = (void *)"Hello";
+ d.dptr = discard_const_p(uint8_t, "Hello");
d.dsize = 5;
ok1(tdb_store(tdb, d, d, TDB_INSERT) == 0);
tdb_close(tdb);
diff --git a/lib/tdb/test/run-nested-transactions.c b/lib/tdb/test/run-nested-transactions.c
index 8c84bcac83..bf08e55afe 100644
--- a/lib/tdb/test/run-nested-transactions.c
+++ b/lib/tdb/test/run-nested-transactions.c
@@ -21,7 +21,7 @@ int main(int argc, char *argv[])
plan_tests(27);
key.dsize = strlen("hi");
- key.dptr = (void *)"hi";
+ key.dptr = discard_const_p(uint8_t, "hi");
tdb = tdb_open_ex("run-nested-transactions.tdb",
1024, TDB_CLEAR_IF_FIRST|TDB_DISALLOW_NESTING,
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
/* Nesting disallowed. */
ok1(tdb_transaction_start(tdb) == 0);
- data.dptr = (void *)"world";
+ data.dptr = discard_const_p(uint8_t, "world");
data.dsize = strlen("world");
ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
data = tdb_fetch(tdb, key);
diff --git a/lib/tdb/test/run-nested-traverse.c b/lib/tdb/test/run-nested-traverse.c
index 37d57c0125..361dc2ece7 100644
--- a/lib/tdb/test/run-nested-traverse.c
+++ b/lib/tdb/test/run-nested-traverse.c
@@ -74,8 +74,8 @@ int main(int argc, char *argv[])
== SUCCESS);
key.dsize = strlen("hi");
- key.dptr = (void *)"hi";
- data.dptr = (void *)"world";
+ key.dptr = discard_const_p(uint8_t, "hi");
+ data.dptr = discard_const_p(uint8_t, "world");
data.dsize = strlen("world");
ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
diff --git a/lib/tdb/test/run-no-lock-during-traverse.c b/lib/tdb/test/run-no-lock-during-traverse.c
index 0a72282eb6..b5e31dc100 100644
--- a/lib/tdb/test/run-no-lock-during-traverse.c
+++ b/lib/tdb/test/run-no-lock-during-traverse.c
@@ -30,7 +30,7 @@ static bool prepare_entries(struct tdb_context *tdb)
key.dsize = sizeof(i);
key.dptr = (void *)&i;
data.dsize = strlen("world");
- data.dptr = (void *)"world";
+ data.dptr = discard_const_p(uint8_t, "world");
if (tdb_store(tdb, key, data, 0) != 0)
return false;
diff --git a/lib/tdb/test/run-open-during-transaction.c b/lib/tdb/test/run-open-during-transaction.c
index 32844fb35e..04ba956d45 100644
--- a/lib/tdb/test/run-open-during-transaction.c
+++ b/lib/tdb/test/run-open-during-transaction.c
@@ -165,8 +165,8 @@ int main(int argc, char *argv[])
opened = true;
ok1(tdb_transaction_start(tdb) == 0);
key.dsize = strlen("hi");
- key.dptr = (void *)"hi";
- data.dptr = (void *)"world";
+ key.dptr = discard_const_p(uint8_t, "hi");
+ data.dptr = discard_const_p(uint8_t, "world");
data.dsize = strlen("world");
ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
diff --git a/lib/tdb/test/run-readonly-check.c b/lib/tdb/test/run-readonly-check.c
index fdd9507cda..e518532424 100644
--- a/lib/tdb/test/run-readonly-check.c
+++ b/lib/tdb/test/run-readonly-check.c
@@ -27,9 +27,9 @@ int main(int argc, char *argv[])
ok1(tdb);
key.dsize = strlen("hi");
- key.dptr = (void *)"hi";
+ key.dptr = discard_const_p(uint8_t, "hi");
data.dsize = strlen("world");
- data.dptr = (void *)"world";
+ data.dptr = discard_const_p(uint8_t, "world");
ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
ok1(tdb_check(tdb, NULL, NULL) == 0);
diff --git a/lib/tdb/test/run-rescue.c b/lib/tdb/test/run-rescue.c
index d0369e38b2..7c806a40b4 100644
--- a/lib/tdb/test/run-rescue.c
+++ b/lib/tdb/test/run-rescue.c
@@ -29,7 +29,7 @@ static inline bool tdb_deq(TDB_DATA a, TDB_DATA b)
static inline TDB_DATA tdb_mkdata(const void *p, size_t len)
{
TDB_DATA d;
- d.dptr = (void *)p;
+ d.dptr = discard_const_p(uint8_t, p);
d.dsize = len;
return d;
}
@@ -76,9 +76,9 @@ int main(int argc, char *argv[])
O_CREAT|O_TRUNC|O_RDWR, 0600, &log_ctx, NULL);
wd.key.dsize = strlen("hi");
- wd.key.dptr = (void *)"hi";
+ wd.key.dptr = discard_const_p(uint8_t, "hi");
wd.data.dsize = strlen("world");
- wd.data.dptr = (void *)"world";
+ wd.data.dptr = discard_const_p(uint8_t, "world");
wd.count = 0;
wd.fail = false;
diff --git a/lib/tdb/test/run-transaction-expand.c b/lib/tdb/test/run-transaction-expand.c
index d62c76a88c..ddf1f2432d 100644
--- a/lib/tdb/test/run-transaction-expand.c
+++ b/lib/tdb/test/run-transaction-expand.c
@@ -46,7 +46,7 @@ static void write_record(struct tdb_context *tdb, size_t extra_len,
{
TDB_DATA key;
key.dsize = strlen("hi");
- key.dptr = (void *)"hi";
+ key.dptr = discard_const_p(uint8_t, "hi");
data->dsize += extra_len;
tdb_transaction_start(tdb);
diff --git a/lib/tdb/test/run-traverse-in-transaction.c b/lib/tdb/test/run-traverse-in-transaction.c
index bcdc3545cd..48194b8fdb 100644
--- a/lib/tdb/test/run-traverse-in-transaction.c
+++ b/lib/tdb/test/run-traverse-in-transaction.c
@@ -54,8 +54,8 @@ int main(int argc, char *argv[])
ok1(tdb);
key.dsize = strlen("hi");
- key.dptr = (void *)"hi";
- data.dptr = (void *)"world";
+ key.dptr = discard_const_p(uint8_t, "hi");
+ data.dptr = discard_const_p(uint8_t, "world");
data.dsize = strlen("world");
ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
diff --git a/lib/tdb/test/run-wronghash-fail.c b/lib/tdb/test/run-wronghash-fail.c
index 74bbc30ba6..9c78fc5e3e 100644
--- a/lib/tdb/test/run-wronghash-fail.c
+++ b/lib/tdb/test/run-wronghash-fail.c
@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
O_CREAT|O_RDWR|O_TRUNC, 0600, &log_ctx, NULL);
ok1(tdb);
ok1(log_count == 0);
- d.dptr = (void *)"Hello";
+ d.dptr = discard_const_p(uint8_t, "Hello");
d.dsize = 5;
ok1(tdb_store(tdb, d, d, TDB_INSERT) == 0);
tdb_close(tdb);
diff --git a/lib/tdb/test/run-zero-append.c b/lib/tdb/test/run-zero-append.c
index 36bf6990f5..a2324c437a 100644
--- a/lib/tdb/test/run-zero-append.c
+++ b/lib/tdb/test/run-zero-append.c
@@ -25,8 +25,8 @@ int main(int argc, char *argv[])
/* Tickle bug on appending zero length buffer to zero length buffer. */
key.dsize = strlen("hi");
- key.dptr = (void *)"hi";
- data.dptr = (void *)"world";
+ key.dptr = discard_const_p(uint8_t, "hi");
+ data.dptr = discard_const_p(uint8_t, "world");
data.dsize = 0;
ok1(tdb_append(tdb, key, data) == 0);
diff --git a/lib/tdb/test/run.c b/lib/tdb/test/run.c
index f49e85055e..f61fcf6820 100644
--- a/lib/tdb/test/run.c
+++ b/lib/tdb/test/run.c
@@ -24,9 +24,9 @@ int main(int argc, char *argv[])
ok1(tdb);
key.dsize = strlen("hi");
- key.dptr = (void *)"hi";
+ key.dptr = discard_const_p(uint8_t, "hi");
data.dsize = strlen("world");
- data.dptr = (void *)"world";
+ data.dptr = discard_const_p(uint8_t, "world");
ok1(tdb_store(tdb, key, data, TDB_MODIFY) < 0);
ok1(tdb_error(tdb) == TDB_ERR_NOEXIST);
generated by cgit (git 2.34.1) at 2025-06-17 07:58:54 +0000