From 4816ffacb81d3234231730149c7b0629bb3646a4 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 22 Mar 2012 10:47:27 +1030 Subject: [PATCH] lib/tdb2: fix -Wcast-qual warnings. We use tdb_mkdata() to get rid of many of them from the tests, and explicit cast_const() in a few places. tlist_for_each() still causes a warning, but that needs to be fixed in CCAN. Signed-off-by: Rusty Russell Autobuild-User: Rusty Russell Autobuild-Date: Thu Mar 22 03:29:32 CET 2012 on sn-devel-104 --- lib/tdb2/pytdb.c | 9 +++++---- lib/tdb2/test/run-tdb1-3G-file.c | 6 ++---- lib/tdb2/test/run-tdb1-check.c | 6 ++---- lib/tdb2/test/run-tdb1-corrupt.c | 5 ++--- lib/tdb2/test/run-tdb1-endian.c | 9 +++------ lib/tdb2/test/run-tdb1-incompatible.c | 12 ++++-------- lib/tdb2/test/run-tdb1-nested-transactions.c | 6 ++---- lib/tdb2/test/run-tdb1-nested-traverse.c | 6 ++---- lib/tdb2/test/run-tdb1-no-lock-during-traverse.c | 3 +-- lib/tdb2/test/run-tdb1-readonly-check.c | 6 ++---- lib/tdb2/test/run-tdb1-traverse-in-transaction.c | 6 ++---- lib/tdb2/test/run-tdb1-wronghash-fail.c | 3 +-- lib/tdb2/test/run-tdb1-zero-append.c | 6 ++---- lib/tdb2/test/run-tdb1.c | 6 ++---- lib/tdb2/test/tdb1-external-agent.c | 3 +-- 15 files changed, 33 insertions(+), 59 deletions(-) diff --git a/lib/tdb2/pytdb.c b/lib/tdb2/pytdb.c index 87e5bdcd68e5..1fa4e5828b2f 100644 --- a/lib/tdb2/pytdb.c +++ b/lib/tdb2/pytdb.c @@ -91,7 +91,7 @@ static PyObject *py_tdb_open(PyTypeObject *type, PyObject *args, PyObject *kwarg union tdb_attribute logattr; const char *kwnames[] = { "name", "tdb_flags", "flags", "mode", NULL }; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|siii", (char **)kwnames, &name, &tdb_flags, &flags, &mode)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|siii", cast_const2(char **, kwnames), &name, &tdb_flags, &flags, &mode)) return NULL; if (name == NULL) { @@ -450,9 +450,10 @@ static PyObject *obj_get_seqnum(PyTdbObject *self, void *closure) static PyGetSetDef tdb_object_getsetters[] = { - { (char *)"flags", (getter)obj_get_flags, NULL, NULL }, - { (char *)"filename", (getter)obj_get_filename, NULL, (char *)"The filename of this TDB file."}, - { (char *)"seqnum", (getter)obj_get_seqnum, NULL, NULL }, + { cast_const(char *, "flags"), (getter)obj_get_flags, NULL, NULL }, + { cast_const(char *, "filename"), (getter)obj_get_filename, NULL, + cast_const(char *, "The filename of this TDB file.")}, + { cast_const(char *, "seqnum"), (getter)obj_get_seqnum, NULL, NULL }, { NULL } }; diff --git a/lib/tdb2/test/run-tdb1-3G-file.c b/lib/tdb2/test/run-tdb1-3G-file.c index 148611753f27..c6e3042722d8 100644 --- a/lib/tdb2/test/run-tdb1-3G-file.c +++ b/lib/tdb2/test/run-tdb1-3G-file.c @@ -76,10 +76,8 @@ int main(int argc, char *argv[]) ok1(tdb); tdb->tdb1.io = &large_io_methods; - key.dsize = strlen("hi"); - key.dptr = (void *)"hi"; - orig_data.dsize = strlen("world"); - orig_data.dptr = (void *)"world"; + key = tdb_mkdata("hi", strlen("hi")); + orig_data = tdb_mkdata("world", strlen("world")); /* Enlarge the file (internally multiplies by 2). */ ret = tdb1_expand(tdb, 1500000000); diff --git a/lib/tdb2/test/run-tdb1-check.c b/lib/tdb2/test/run-tdb1-check.c index b8f0889b3547..98295d73d3c8 100644 --- a/lib/tdb2/test/run-tdb1-check.c +++ b/lib/tdb2/test/run-tdb1-check.c @@ -21,10 +21,8 @@ int main(int argc, char *argv[]) ok1(tdb); ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); - key.dsize = strlen("hi"); - key.dptr = (void *)"hi"; - data.dsize = strlen("world"); - data.dptr = (void *)"world"; + key = tdb_mkdata("hi", strlen("hi")); + data = tdb_mkdata("world", strlen("world")); ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS); ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); diff --git a/lib/tdb2/test/run-tdb1-corrupt.c b/lib/tdb2/test/run-tdb1-corrupt.c index 6403acb1ea80..d46570f63b72 100644 --- a/lib/tdb2/test/run-tdb1-corrupt.c +++ b/lib/tdb2/test/run-tdb1-corrupt.c @@ -47,9 +47,8 @@ static void check_test(struct tdb_context *tdb) ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); - key.dptr = (void *)"hello"; - data.dsize = strlen("world"); - data.dptr = (void *)"world"; + key = tdb_mkdata("hello", strlen("hello")); + data = tdb_mkdata("world", strlen("world")); /* Key and data size respectively. */ dsize = ksize = 0; diff --git a/lib/tdb2/test/run-tdb1-endian.c b/lib/tdb2/test/run-tdb1-endian.c index a31908009c2e..c72209fcbf9c 100644 --- a/lib/tdb2/test/run-tdb1-endian.c +++ b/lib/tdb2/test/run-tdb1-endian.c @@ -20,10 +20,8 @@ int main(int argc, char *argv[]) O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize); ok1(tdb); - key.dsize = strlen("hi"); - key.dptr = (void *)"hi"; - data.dsize = strlen("world"); - data.dptr = (void *)"world"; + key = tdb_mkdata("hi", strlen("hi")); + data = tdb_mkdata("world", strlen("world")); ok1(tdb_store(tdb, key, data, TDB_MODIFY) == TDB_ERR_NOEXIST); ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS); @@ -44,8 +42,7 @@ int main(int argc, char *argv[]) tdb = tdb_open("run-endian.tdb1", 0, O_RDWR, 0, NULL); ok1(tdb); - key.dsize = strlen("hi"); - key.dptr = (void *)"hi"; + key = tdb_mkdata("hi", strlen("hi")); ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS); ok1(data.dsize == strlen("world")); ok1(memcmp(data.dptr, "world", strlen("world")) == 0); diff --git a/lib/tdb2/test/run-tdb1-incompatible.c b/lib/tdb2/test/run-tdb1-incompatible.c index 84acf1bccd5d..e47890053348 100644 --- a/lib/tdb2/test/run-tdb1-incompatible.c +++ b/lib/tdb2/test/run-tdb1-incompatible.c @@ -87,8 +87,7 @@ int main(int argc, char *argv[]) O_CREAT|O_RDWR|O_TRUNC, 0600, &log_attr); ok1(tdb); ok1(log_count == 0); - d.dptr = (void *)"Hello"; - d.dsize = 5; + d = tdb_mkdata("Hello", strlen("Hello")); ok1(tdb_store(tdb, d, d, TDB_INSERT) == TDB_SUCCESS); tdb_close(tdb); @@ -132,8 +131,7 @@ int main(int argc, char *argv[]) &incompat_hash_attr); ok1(tdb); ok1(log_count == 0); - d.dptr = (void *)"Hello"; - d.dsize = 5; + d = tdb_mkdata("Hello", strlen("Hello")); ok1(tdb_store(tdb, d, d, TDB_INSERT) == TDB_SUCCESS); tdb_close(tdb); @@ -165,8 +163,7 @@ int main(int argc, char *argv[]) O_RDWR, 0600, &log_attr); ok1(tdb); ok1(log_count == 0); - d.dptr = (void *)"Hello"; - d.dsize = 5; + d = tdb_mkdata("Hello", strlen("Hello")); ok1(tdb_fetch(tdb, d, &d) == TDB_SUCCESS); ok1(d.dsize == 5); free(d.dptr); @@ -181,8 +178,7 @@ int main(int argc, char *argv[]) O_CREAT|O_RDWR|O_TRUNC, 0600, &dumbhash_attr); ok1(tdb); ok1(log_count == 0); - d.dptr = (void *)"Hello"; - d.dsize = 5; + d = tdb_mkdata("Hello", strlen("Hello")); ok1(tdb_store(tdb, d, d, TDB_INSERT) == TDB_SUCCESS); tdb_close(tdb); diff --git a/lib/tdb2/test/run-tdb1-nested-transactions.c b/lib/tdb2/test/run-tdb1-nested-transactions.c index 23ab740d9f03..665f28bcefbb 100644 --- a/lib/tdb2/test/run-tdb1-nested-transactions.c +++ b/lib/tdb2/test/run-tdb1-nested-transactions.c @@ -16,8 +16,7 @@ int main(int argc, char *argv[]) hsize.tdb1_hashsize.hsize = 1024; plan_tests(30); - key.dsize = strlen("hi"); - key.dptr = (void *)"hi"; + key = tdb_mkdata("hi", strlen("hi")); tdb = tdb_open("run-nested-transactions.tdb1", TDB_VERSION1, O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize); @@ -25,8 +24,7 @@ int main(int argc, char *argv[]) /* No nesting by default. */ ok1(tdb_transaction_start(tdb) == TDB_SUCCESS); - data.dptr = (void *)"world"; - data.dsize = strlen("world"); + data = tdb_mkdata("world", strlen("world")); ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS); ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS); ok1(data.dsize == strlen("world")); diff --git a/lib/tdb2/test/run-tdb1-nested-traverse.c b/lib/tdb2/test/run-tdb1-nested-traverse.c index 8fa36bd88aec..76bec5a176af 100644 --- a/lib/tdb2/test/run-tdb1-nested-traverse.c +++ b/lib/tdb2/test/run-tdb1-nested-traverse.c @@ -71,10 +71,8 @@ int main(int argc, char *argv[]) ok1(external_agent_operation1(agent, TRANSACTION_COMMIT, tdb->name) == SUCCESS); - key.dsize = strlen("hi"); - key.dptr = (void *)"hi"; - data.dptr = (void *)"world"; - data.dsize = strlen("world"); + key = tdb_mkdata("hi", strlen("hi")); + data = tdb_mkdata("world", strlen("world")); ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS); tdb_traverse(tdb, traverse1, NULL); diff --git a/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c b/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c index 7392d148758d..127e69ad1cfd 100644 --- a/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c +++ b/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c @@ -22,8 +22,7 @@ static bool prepare_entries(struct tdb_context *tdb) for (i = 0; i < NUM_ENTRIES; i++) { key.dsize = sizeof(i); key.dptr = (void *)&i; - data.dsize = strlen("world"); - data.dptr = (void *)"world"; + data = tdb_mkdata("world", strlen("world")); if (tdb_store(tdb, key, data, 0) != TDB_SUCCESS) return false; diff --git a/lib/tdb2/test/run-tdb1-readonly-check.c b/lib/tdb2/test/run-tdb1-readonly-check.c index c15c06ab92b2..cd39647fc574 100644 --- a/lib/tdb2/test/run-tdb1-readonly-check.c +++ b/lib/tdb2/test/run-tdb1-readonly-check.c @@ -22,10 +22,8 @@ int main(int argc, char *argv[]) O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize); ok1(tdb); - key.dsize = strlen("hi"); - key.dptr = (void *)"hi"; - data.dsize = strlen("world"); - data.dptr = (void *)"world"; + key = tdb_mkdata("hi", strlen("hi")); + data = tdb_mkdata("world", strlen("world")); ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS); ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); diff --git a/lib/tdb2/test/run-tdb1-traverse-in-transaction.c b/lib/tdb2/test/run-tdb1-traverse-in-transaction.c index 7732d54cf7a0..318ec1028895 100644 --- a/lib/tdb2/test/run-tdb1-traverse-in-transaction.c +++ b/lib/tdb2/test/run-tdb1-traverse-in-transaction.c @@ -52,10 +52,8 @@ int main(int argc, char *argv[]) 0600, &hsize); ok1(tdb); - key.dsize = strlen("hi"); - key.dptr = (void *)"hi"; - data.dptr = (void *)"world"; - data.dsize = strlen("world"); + key = tdb_mkdata("hi", strlen("hi")); + data = tdb_mkdata("world", strlen("world")); ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS); diff --git a/lib/tdb2/test/run-tdb1-wronghash-fail.c b/lib/tdb2/test/run-tdb1-wronghash-fail.c index 19f926c7876d..6a9dae3a70b2 100644 --- a/lib/tdb2/test/run-tdb1-wronghash-fail.c +++ b/lib/tdb2/test/run-tdb1-wronghash-fail.c @@ -58,8 +58,7 @@ int main(int argc, char *argv[]) O_CREAT|O_RDWR|O_TRUNC, 0600, &log_attr); ok1(tdb); ok1(log_count == 0); - d.dptr = (void *)"Hello"; - d.dsize = 5; + d = tdb_mkdata("Hello", strlen("Hello")); ok1(tdb_store(tdb, d, d, TDB_INSERT) == TDB_SUCCESS); tdb_close(tdb); diff --git a/lib/tdb2/test/run-tdb1-zero-append.c b/lib/tdb2/test/run-tdb1-zero-append.c index 16a097ce305f..b5e55c02228c 100644 --- a/lib/tdb2/test/run-tdb1-zero-append.c +++ b/lib/tdb2/test/run-tdb1-zero-append.c @@ -20,10 +20,8 @@ int main(int argc, char *argv[]) ok1(tdb); /* Tickle bug on appending zero length buffer to zero length buffer. */ - key.dsize = strlen("hi"); - key.dptr = (void *)"hi"; - data.dptr = (void *)"world"; - data.dsize = 0; + key = tdb_mkdata("hi", strlen("hi")); + data = tdb_mkdata("world", 0); ok1(tdb_append(tdb, key, data) == TDB_SUCCESS); ok1(tdb_append(tdb, key, data) == TDB_SUCCESS); diff --git a/lib/tdb2/test/run-tdb1.c b/lib/tdb2/test/run-tdb1.c index eebdcdb2124d..4769a5f6d8ea 100644 --- a/lib/tdb2/test/run-tdb1.c +++ b/lib/tdb2/test/run-tdb1.c @@ -19,10 +19,8 @@ int main(int argc, char *argv[]) O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize); ok1(tdb); - key.dsize = strlen("hi"); - key.dptr = (void *)"hi"; - data.dsize = strlen("world"); - data.dptr = (void *)"world"; + key = tdb_mkdata("hi", strlen("hi")); + data = tdb_mkdata("world", strlen("world")); ok1(tdb_store(tdb, key, data, TDB_MODIFY) == TDB_ERR_NOEXIST); ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS); diff --git a/lib/tdb2/test/tdb1-external-agent.c b/lib/tdb2/test/tdb1-external-agent.c index dff7012a4082..2ba05741fce9 100644 --- a/lib/tdb2/test/tdb1-external-agent.c +++ b/lib/tdb2/test/tdb1-external-agent.c @@ -28,8 +28,7 @@ static enum agent_return do_operation(enum operation op, const char *name) return OTHER_FAILURE; } - k.dptr = (void *)name; - k.dsize = strlen(name); + k = tdb_mkdata(name, strlen(name)); locking_would_block1 = 0; switch (op) { -- 2.34.1