X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Fopen.c;h=f7d6b3c5f3e5dbe356d9b842fcb1c30c36e93800;hb=f2a1247955c1b376469a5e37c9583a1bbfd4dc61;hp=f2d23aed9cc2abe07cf1d1624f266c63ebd1797e;hpb=8d8de08d9079f503256e1682dfa93bb22dcd4ad0;p=ccan

diff --git a/ccan/tdb2/open.c b/ccan/tdb2/open.c
index f2d23aed..f7d6b3c5 100644
--- a/ccan/tdb2/open.c
+++ b/ccan/tdb2/open.c
@@ -209,6 +209,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 	tdb->transaction = NULL;
 	tdb->stats = NULL;
 	tdb->access = NULL;
+	tdb->last_error = TDB_SUCCESS;
 	tdb->file = NULL;
 	tdb_hash_init(tdb);
 	tdb_io_init(tdb);
@@ -453,7 +454,7 @@ fail_errno:
 #ifdef TDB_TRACE
 	close(tdb->tracefd);
 #endif
-	free((char *)tdb->name);
+	free(cast_const(char *, tdb->name));
 	if (tdb->file) {
 		tdb_unlock_all(tdb);
 		if (--tdb->file->refcnt == 0) {
@@ -494,7 +495,7 @@ int tdb_close(struct tdb_context *tdb)
 		else
 			tdb_munmap(tdb->file);
 	}
-	free((char *)tdb->name);
+	free(cast_const(char *, tdb->name));
 	if (tdb->file) {
 		struct tdb_file **i;