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) {
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 }
};
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);
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);
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;
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);
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);
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);
&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);
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);
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);
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);
/* 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"));
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);
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;
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);
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);
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);
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);
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);
return OTHER_FAILURE;
}
- k.dptr = (void *)name;
- k.dsize = strlen(name);
+ k = tdb_mkdata(name, strlen(name));
locking_would_block1 = 0;
switch (op) {