lib/tdb2: fix -Wcast-qual warnings.

[sfrench/samba-autobuild/.git] / lib / tdb2 / test / tdb1-external-agent.c

diff --git a/lib/tdb2/test/tdb1-external-agent.c b/lib/tdb2/test/tdb1-external-agent.c
index ffde0770255f4b5be717a11de721b1ad557e0e65..2ba05741fce983a25892bd0c187c38290b1a6941 100644 (file)
--- a/lib/tdb2/test/tdb1-external-agent.c
+++ b/lib/tdb2/test/tdb1-external-agent.c
@@ -10,8 +10,8 @@
 #include <limits.h>
 #include <string.h>
 #include <errno.h>
-#include <ccan/tdb2/tdb1_private.h>
-#include <ccan/tap/tap.h>
+#include "tdb1_private.h"
+#include "tap-interface.h"
 #include <stdio.h>
 #include <stdarg.h>
 
@@ -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) {
@@ -76,7 +75,7 @@ static enum agent_return do_operation(enum operation op, const char *name)
                ret = tdb_check(tdb, NULL, NULL) == TDB_SUCCESS ? SUCCESS : OTHER_FAILURE;
                break;
        case NEEDS_RECOVERY:
-               ret = tdb1_needs_recovery(tdb) ? SUCCESS : FAILED;
+               ret = external_agent_needs_rec(tdb);
                break;
        case CLOSE:
                ret = tdb_close(tdb) == 0 ? SUCCESS : OTHER_FAILURE;