tdb/test: avoid const warnings by using 'discard_const_p(uint8_t,' instead of '(void *)'

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/tdb/test/external-agent.c b/lib/tdb/test/external-agent.c
index 8140e70ead05b46e1e056f5268cce5813404e1ed..8710b478320782a640d462af931bf7e141daa001 100644 (file)
--- 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 f21544a6af538062ca83e86845228fe2fbc9366d..67fd54f54fd25bee7c9dcedccf32cf0acc4dab0e 100644 (file)
--- 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 05f7aecd0839b3c842c907a9d33afbbfa809ef7d..b27569148317e11c95560f29d57114810498741b 100644 (file)
--- 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 1a3c769183243aad665e77784c1fb129d5b4ffe3..93eae42ce161ea14fe53e6c952d303d5e34df73c 100644 (file)
--- 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 6e3a70d4ae67372db850868a7df45a6042a51c15..9b9041552ed762701e05f397beaa1c2bb42235f0 100644 (file)
--- 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 b19ffd373f1fa7f23b3df78c0cb6bb8d65472ac2..3116f7da51b80309e3a66d7d9e9f9623830e5b76 100644 (file)
--- 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 628927c88687d0b21f4ac6782501bd71e461b034..af01ca6a3951f3d549badef4e4bff20c55f92c79 100644 (file)
--- 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 8c84bcac836a4b2251f472e93241a9d5ec8f4448..bf08e55afee6b8597319ca06ce20dced6a1f9430 100644 (file)
--- 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 37d57c012581eb841aa2d6d3c336b89e363907ea..361dc2ece71a233b3efbf11cc3cefb3d1d2f7efa 100644 (file)
--- 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 0a72282eb6d8274c2cfe7c2c3945109a1cb6f2b0..b5e31dc10018a332b0fcf5009d383ad92b4d114e 100644 (file)
--- 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 32844fb35e8ae009cf0f18db5d8505afa45d32fd..04ba956d45af6a07f12ba366f3163cba967ca29e 100644 (file)
--- 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 fdd9507cdad225503e2506e26577542feb2357cc..e5185324246f057f79f58ca102d2878549e3b493 100644 (file)
--- 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 d0369e38b23b25c49a2215f8a823f011bda85f12..7c806a40b45422658cce8031b1be92d26884f2ad 100644 (file)
--- 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 d62c76a88cfcc321d597f0e063e9ff4948c4fb91..ddf1f2432da97b6a4a4342fe8f825eff4e1432e8 100644 (file)
--- 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 bcdc3545cd5b27148e8d118c0d4e95977a4d3470..48194b8fdbff89a09d7348d6aafa6ad05fb6c321 100644 (file)
--- 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 74bbc30ba6fbf2b4ba6c791166d10b25d2df73f1..9c78fc5e3e13bea7834e44a4fd99bf3025ee9d41 100644 (file)
--- 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 36bf6990f53eb32ac3bd0a478e0c971f9a0704a0..a2324c437a47291812dd2480883598b3a4bcc1ad 100644 (file)
--- 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 f49e85055e561a788bbc7e030f2ffa3a2349419d..f61fcf68204376f186c6f5589e73e11d2becf55f 100644 (file)
--- 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);