From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 21 Mar 2011 11:34:30 +0000 (+1030)
Subject: tdb2: fix warnings with -Wcast-qual using ccan/cast.
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=45e9956d665dc8819eb183ae239581410dcecdb3

tdb2: fix warnings with -Wcast-qual using ccan/cast.
---

diff --git a/ccan/tdb2/_info b/ccan/tdb2/_info
index 0e894e5b..b1fc56d5 100644
--- a/ccan/tdb2/_info
+++ b/ccan/tdb2/_info
@@ -86,6 +86,7 @@ int main(int argc, char *argv[])
 		printf("ccan/failtest\n");
 		printf("ccan/tally\n");
 		printf("ccan/typesafe_cb\n");
+		printf("ccan/cast\n");
 		return 0;
 	}
 
diff --git a/ccan/tdb2/io.c b/ccan/tdb2/io.c
index 0e27e1d0..4ed37ca2 100644
--- a/ccan/tdb2/io.c
+++ b/ccan/tdb2/io.c
@@ -439,7 +439,7 @@ static enum TDB_ERROR tdb_expand_file(struct tdb_context *tdb,
 const void *tdb_access_read(struct tdb_context *tdb,
 			    tdb_off_t off, tdb_len_t len, bool convert)
 {
-	const void *ret = NULL;
+	void *ret = NULL;
 
 	if (likely(!(tdb->flags & TDB_CONVERT))) {
 		ret = tdb->methods->direct(tdb, off, len, false);
diff --git a/ccan/tdb2/open.c b/ccan/tdb2/open.c
index 9aaa218a..f7d6b3c5 100644
--- a/ccan/tdb2/open.c
+++ b/ccan/tdb2/open.c
@@ -454,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) {
@@ -495,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;
 
diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 63354a43..1e31ec15 100644
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -35,6 +35,7 @@
 #include <ccan/tdb2/tdb2.h>
 #include <ccan/likely/likely.h>
 #include <ccan/compiler/compiler.h>
+#include <ccan/cast/cast.h>
 #if HAVE_BYTESWAP_H
 #include <byteswap.h>
 #endif
@@ -75,7 +76,7 @@ typedef uint64_t tdb_off_t;
 
 /* Packing errors into pointers and v.v. */
 #define TDB_PTR_IS_ERR(ptr) \
-	unlikely((void *)(ptr) >= (void *)(long)TDB_ERR_LAST)
+	unlikely((unsigned long)(ptr) >= (unsigned long)TDB_ERR_LAST)
 #define TDB_PTR_ERR(p) ((enum TDB_ERROR)(long)(p))
 #define TDB_ERR_PTR(err) ((void *)(long)(err))