X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftools%2Ftdbtool.c;h=262253cda45a33c99e9b0e9b20b1d9856e269bce;hb=48241893712414cf3d3992a7dbe3d119925559ff;hp=a00ebb904b9ac37b13e7f086ccc38e8409dc4199;hpb=d5bb8e8d1c6731a3db234393c8d196b3b50084f2;p=ccan

diff --git a/ccan/tdb2/tools/tdbtool.c b/ccan/tdb2/tools/tdbtool.c
index a00ebb90..262253cd 100644
--- a/ccan/tdb2/tools/tdbtool.c
+++ b/ccan/tdb2/tools/tdbtool.c
@@ -127,7 +127,7 @@ static double _end_timer(void)
 }
 
 static void tdb_log(struct tdb_context *tdb, enum tdb_log_level level,
-		    void *priv, const char *message)
+		    const char *message, void *priv)
 {
 	fputs(message, stderr);
 }
@@ -233,7 +233,7 @@ static void create_tdb(const char *tdbname)
 	union tdb_attribute log_attr;
 	log_attr.base.attr = TDB_ATTRIBUTE_LOG;
 	log_attr.base.next = NULL;
-	log_attr.log.log_fn = tdb_log;
+	log_attr.log.fn = tdb_log;
 
 	if (tdb) tdb_close(tdb);
 	tdb = tdb_open(tdbname, (disable_mmap?TDB_NOMMAP:0),
@@ -248,7 +248,7 @@ static void open_tdb(const char *tdbname)
 	union tdb_attribute log_attr;
 	log_attr.base.attr = TDB_ATTRIBUTE_LOG;
 	log_attr.base.next = NULL;
-	log_attr.log.log_fn = tdb_log;
+	log_attr.log.fn = tdb_log;
 
 	if (tdb) tdb_close(tdb);
 	tdb = tdb_open(tdbname, disable_mmap?TDB_NOMMAP:0, O_RDWR, 0600,
@@ -454,8 +454,7 @@ static void speed_tdb(const char *tlimit)
 	do {
 		long int r = random();
 		TDB_DATA key, dbuf;
-		key.dptr = (unsigned char *)"store test";
-		key.dsize = strlen((char *)key.dptr);
+		key = tdb_mkdata("store test", strlen("store test"));
 		dbuf.dptr = (unsigned char *)&r;
 		dbuf.dsize = sizeof(r);
 		tdb_store(tdb, key, dbuf, TDB_REPLACE);
@@ -470,8 +469,7 @@ static void speed_tdb(const char *tlimit)
 	do {
 		long int r = random();
 		TDB_DATA key, dbuf;
-		key.dptr = (unsigned char *)"store test";
-		key.dsize = strlen((char *)key.dptr);
+		key = tdb_mkdata("store test", strlen("store test"));
 		dbuf.dptr = (unsigned char *)&r;
 		dbuf.dsize = sizeof(r);
 		tdb_fetch(tdb, key, &dbuf);
@@ -486,8 +484,7 @@ static void speed_tdb(const char *tlimit)
 	do {
 		long int r = random();
 		TDB_DATA key, dbuf;
-		key.dptr = (unsigned char *)"transaction test";
-		key.dsize = strlen((char *)key.dptr);
+		key = tdb_mkdata("transaction test", strlen("transaction test"));
 		dbuf.dptr = (unsigned char *)&r;
 		dbuf.dsize = sizeof(r);
 		tdb_transaction_start(tdb);