Oops, forgot to check in new keywords files :(

diff --git a/ccan/tdb/tools/keywords.c b/ccan/tdb/tools/keywords.c
index 18bc0ec9bad507985b92e86533c12809fd8bdaaf..9c0ee87f362356290e94cc9fd46b52f6c4eac36a 100644 (file)
--- a/ccan/tdb/tools/keywords.c
+++ b/ccan/tdb/tools/keywords.c
@@ -157,10 +157,10 @@ find_keyword (register const char *str, register unsigned int len)
 #line 44 "keywords.gperf"
       {"tdb_firstkey", OP_TDB_FIRSTKEY, op_add_key,},
 #line 24 "keywords.gperf"
-      {"tdb_chainlock", OP_TDB_CHAINLOCK, op_add_key,},
+      {"tdb_chainlock", OP_TDB_CHAINLOCK, op_add_chainlock,},
       {""},
 #line 28 "keywords.gperf"
-      {"tdb_chainunlock", OP_TDB_CHAINUNLOCK, op_add_key,},
+      {"tdb_chainunlock", OP_TDB_CHAINUNLOCK, op_analyze_chainlock,},
 #line 45 "keywords.gperf"
       {"tdb_nextkey", OP_TDB_NEXTKEY, op_add_key_data,},
       {""},
@@ -171,12 +171,12 @@ find_keyword (register const char *str, register unsigned int len)
       {"tdb_chainlock_unmark", OP_TDB_CHAINLOCK_UNMARK, op_add_key,},
       {""},
 #line 25 "keywords.gperf"
-      {"tdb_chainlock_nonblock", OP_TDB_CHAINLOCK_NONBLOCK, op_add_key_ret,},
+      {"tdb_chainlock_nonblock", OP_TDB_CHAINLOCK_NONBLOCK, op_add_chainlock_ret,},
 #line 29 "keywords.gperf"
-      {"tdb_chainlock_read", OP_TDB_CHAINLOCK_READ, op_add_key,},
+      {"tdb_chainlock_read", OP_TDB_CHAINLOCK_READ, op_add_chainlock,},
       {""},
 #line 30 "keywords.gperf"
-      {"tdb_chainunlock_read", OP_TDB_CHAINUNLOCK_READ, op_add_key,}
+      {"tdb_chainunlock_read", OP_TDB_CHAINUNLOCK_READ, op_analyze_chainlock,}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)

diff --git a/ccan/tdb/tools/keywords.gperf b/ccan/tdb/tools/keywords.gperf
index dc445463b91bcabdef90ba7fa3fd3d84dabdc6bb..f2da43b953754968c9d5cc69c226ca28a1d4bd0c 100644 (file)
--- a/ccan/tdb/tools/keywords.gperf
+++ b/ccan/tdb/tools/keywords.gperf
@@ -21,13 +21,13 @@ tdb_unlockall, OP_TDB_UNLOCKALL, op_add_nothing,
 tdb_lockall_read, OP_TDB_LOCKALL_READ, op_add_nothing,
 tdb_lockall_read_nonblock, OP_TDB_LOCKALL_READ_NONBLOCK, op_add_nothing,
 tdb_unlockall_read, OP_TDB_UNLOCKALL_READ, op_add_nothing,
-tdb_chainlock, OP_TDB_CHAINLOCK, op_add_key,
-tdb_chainlock_nonblock, OP_TDB_CHAINLOCK_NONBLOCK, op_add_key_ret,
+tdb_chainlock, OP_TDB_CHAINLOCK, op_add_chainlock,
+tdb_chainlock_nonblock, OP_TDB_CHAINLOCK_NONBLOCK, op_add_chainlock_ret,
 tdb_chainlock_mark, OP_TDB_CHAINLOCK_MARK, op_add_key,
 tdb_chainlock_unmark, OP_TDB_CHAINLOCK_UNMARK, op_add_key,
-tdb_chainunlock, OP_TDB_CHAINUNLOCK, op_add_key,
-tdb_chainlock_read, OP_TDB_CHAINLOCK_READ, op_add_key,
-tdb_chainunlock_read, OP_TDB_CHAINUNLOCK_READ, op_add_key,
+tdb_chainunlock, OP_TDB_CHAINUNLOCK, op_analyze_chainlock,
+tdb_chainlock_read, OP_TDB_CHAINLOCK_READ, op_add_chainlock,
+tdb_chainunlock_read, OP_TDB_CHAINUNLOCK_READ, op_analyze_chainlock,
 tdb_parse_record, OP_TDB_PARSE_RECORD, op_add_key_ret,
 tdb_exists, OP_TDB_EXISTS, op_add_key_ret,
 tdb_store, OP_TDB_STORE, op_add_store,