]> git.ozlabs.org Git - ccan/blobdiff - ccan/tdb2/test/tdb1-external-agent.c
tdb2: unify tdb1_transaction_start etc. into tdb_transaction_start.
[ccan] / ccan / tdb2 / test / tdb1-external-agent.c
index eb52e55f62799381d1069acdd243a1aed5bcad9f..6b6f87dea5ea64bce3f1e4d83b7dc75365d5a873 100644 (file)
@@ -48,11 +48,10 @@ static enum agent_return do_operation(enum operation op, const char *name)
                        ret = SUCCESS;
                break;
        case TRANSACTION_START:
-               ret = tdb1_transaction_start(tdb) == 0 ? SUCCESS : OTHER_FAILURE;
+               ret = tdb_transaction_start(tdb) == TDB_SUCCESS ? SUCCESS : OTHER_FAILURE;
                break;
        case FETCH:
-               data = tdb1_fetch(tdb, k);
-               if (data.dptr == NULL) {
+               if (tdb_fetch(tdb, k, &data) != TDB_SUCCESS) {
                        if (tdb->last_error == TDB_ERR_NOEXIST)
                                ret = FAILED;
                        else
@@ -66,10 +65,13 @@ static enum agent_return do_operation(enum operation op, const char *name)
                free(data.dptr);
                break;
        case STORE:
-               ret = tdb1_store(tdb, k, k, 0) == 0 ? SUCCESS : OTHER_FAILURE;
+               if (tdb_store(tdb, k, k, 0) == TDB_SUCCESS)
+                       ret = SUCCESS;
+               else
+                       ret = OTHER_FAILURE;
                break;
        case TRANSACTION_COMMIT:
-               ret = tdb1_transaction_commit(tdb)==0 ? SUCCESS : OTHER_FAILURE;
+               ret = tdb_transaction_commit(tdb) == TDB_SUCCESS ? SUCCESS : OTHER_FAILURE;
                break;
        case CHECK:
                ret = tdb1_check(tdb, NULL, NULL) == 0 ? SUCCESS : OTHER_FAILURE;