typesafe: fix warnings with gcc's -Wcast-qual

Don't implicitly cast away const in the tests.

diff --git a/ccan/typesafe_cb/test/compile_fail-typesafe_cb.c b/ccan/typesafe_cb/test/compile_fail-typesafe_cb.c
index bd20131368cf35dd2bc636d9f0d2bf44f3bd0557..bcc6ed63ea51c5a0f912514fb14c8c970eda488d 100644 (file)
--- a/ccan/typesafe_cb/test/compile_fail-typesafe_cb.c
+++ b/ccan/typesafe_cb/test/compile_fail-typesafe_cb.c
@@ -14,6 +14,7 @@ static void my_callback(char *p)
 
 int main(int argc, char *argv[])
 {
+       char str[] = "hello world";
 #ifdef FAIL
        int *p;
 #if !HAVE_TYPEOF||!HAVE_BUILTIN_CHOOSE_EXPR||!HAVE_BUILTIN_TYPES_COMPATIBLE_P
@@ -25,7 +26,7 @@ int main(int argc, char *argv[])
        p = NULL;
 
        /* This should work always. */
-       register_callback(my_callback, "hello world");
+       register_callback(my_callback, str);
 
        /* This will fail with FAIL defined */
        register_callback(my_callback, p);

diff --git a/ccan/typesafe_cb/test/compile_ok-typesafe_cb-NULL.c b/ccan/typesafe_cb/test/compile_ok-typesafe_cb-NULL.c
index e3dceb245eefb56541d5b03db8f7c816d2b087d0..9346170dfdafbbb72dce23a868ff216ca951033d 100644 (file)
--- a/ccan/typesafe_cb/test/compile_ok-typesafe_cb-NULL.c
+++ b/ccan/typesafe_cb/test/compile_ok-typesafe_cb-NULL.c
@@ -3,7 +3,7 @@
 
 /* NULL args for callback function should be OK for _exact and _def. */
 
-static void _register_callback(void (*cb)(void *arg), void *arg)
+static void _register_callback(void (*cb)(const void *arg), const void *arg)
 {
 }
 

diff --git a/ccan/typesafe_cb/test/compile_ok-typesafe_cb-const.c b/ccan/typesafe_cb/test/compile_ok-typesafe_cb-const.c
index 1e4a77b25399c44bcfc4e92abba5992611bcb1ee..7c2d62ef231b599909c4dda29d61b14488ed97a6 100644 (file)
--- a/ccan/typesafe_cb/test/compile_ok-typesafe_cb-const.c
+++ b/ccan/typesafe_cb/test/compile_ok-typesafe_cb-const.c
@@ -41,9 +41,10 @@ static void my_callback_post(/*const*/ char *p, int x)
 
 int main(int argc, char *argv[])
 {
-       register_callback(my_callback, "hello world");
-       register_callback_def(my_callback, "hello world");
-       register_callback_pre(my_callback_pre, "hello world");
-       register_callback_post(my_callback_post, "hello world");
+       char p[] = "hello world";
+       register_callback(my_callback, p);
+       register_callback_def(my_callback, p);
+       register_callback_pre(my_callback_pre, p);
+       register_callback_post(my_callback_post, p);
        return 0;
 }

diff --git a/ccan/typesafe_cb/test/compile_ok-typesafe_cb-volatile.c b/ccan/typesafe_cb/test/compile_ok-typesafe_cb-volatile.c
index ecb0c58b2dc8bfccf4f0e6f2bbbe4efcbcbc32c6..3fcb1ff656b3b576b887a74c63577b2fbca84247 100644 (file)
--- a/ccan/typesafe_cb/test/compile_ok-typesafe_cb-volatile.c
+++ b/ccan/typesafe_cb/test/compile_ok-typesafe_cb-volatile.c
@@ -39,8 +39,9 @@ static void my_callback_post(/* volatile */ char *p, int x)
 
 int main(int argc, char *argv[])
 {
-       register_callback(my_callback, "hello world");
-       register_callback_pre(my_callback_pre, "hello world");
-       register_callback_post(my_callback_post, "hello world");
+       char p[] = "hello world";
+       register_callback(my_callback, p);
+       register_callback_pre(my_callback_pre, p);
+       register_callback_post(my_callback_post, p);
        return 0;
 }

diff --git a/ccan/typesafe_cb/test/compile_ok-typesafe_cb_def-const.c b/ccan/typesafe_cb/test/compile_ok-typesafe_cb_def-const.c
index 5017928a39e70aebd476e74e7dac0b45323bde6d..01e090f1dce310da97897e6fc7f41881aed10958 100644 (file)
--- a/ccan/typesafe_cb/test/compile_ok-typesafe_cb_def-const.c
+++ b/ccan/typesafe_cb/test/compile_ok-typesafe_cb_def-const.c
@@ -38,8 +38,9 @@ static void my_callback_post(/*const*/ char *p, int x)
 
 int main(int argc, char *argv[])
 {
-       register_callback(my_callback, "hello world");
-       register_callback_pre(my_callback_pre, "hello world");
-       register_callback_post(my_callback_post, "hello world");
+       char p[] = "hello world";
+       register_callback(my_callback, p);
+       register_callback_pre(my_callback_pre, p);
+       register_callback_post(my_callback_post, p);
        return 0;
 }

diff --git a/ccan/typesafe_cb/test/run.c b/ccan/typesafe_cb/test/run.c
index ef10d44b8ee6e21b796ccdd09aee3b0ec4774c73..5afbb91877d0f505ca32d23dc4219a272f825d91 100644 (file)
--- a/ccan/typesafe_cb/test/run.c
+++ b/ccan/typesafe_cb/test/run.c
@@ -1,5 +1,6 @@
 #include <ccan/typesafe_cb/typesafe_cb.h>
 #include <string.h>
+#include <stdint.h>
 #include <ccan/tap/tap.h>
 
 static char dummy = 0;
@@ -49,7 +50,8 @@ static void my_callback_onearg_const(const char *p)
 
 static void my_callback_onearg_volatile(volatile char *p)
 {
-       ok1(strcmp((char *)p, "hello world") == 0);
+       /* Double cast avoids warning on gcc's -Wcast-qual */
+       ok1(strcmp((char *)(intptr_t)p, "hello world") == 0);
 }
 
 static void my_callback_preargs(int a, int b, char *p)
@@ -103,53 +105,57 @@ static void my_callback_postargs_volatile(volatile char *p, int a, int b)
 struct callback_onearg
 {
        void (*fn)(void *arg);
-       void *arg;
+       const void *arg;
 };
 
 struct callback_onearg cb_onearg
-= { typesafe_cb(void, my_callback_onearg, "hello world"), "hello world" };
+= { typesafe_cb(void, my_callback_onearg, (char *)(intptr_t)"hello world"),
+    "hello world" };
 
 struct callback_preargs
 {
        void (*fn)(int a, int b, void *arg);
-       void *arg;
+       const void *arg;
 };
 
 struct callback_preargs cb_preargs
-= { typesafe_cb_preargs(void, my_callback_preargs, "hi", int, int), "hi" };
+= { typesafe_cb_preargs(void, my_callback_preargs,
+                       (char *)(intptr_t)"hi", int, int), "hi" };
 
 struct callback_postargs
 {
        void (*fn)(void *arg, int a, int b);
-       void *arg;
+       const void *arg;
 };
 
 struct callback_postargs cb_postargs
-= { typesafe_cb_postargs(void, my_callback_postargs, "hi", int, int), "hi" };
+= { typesafe_cb_postargs(void, my_callback_postargs, 
+                        (char *)(intptr_t)"hi", int, int), "hi" };
 
 int main(int argc, char *argv[])
 {
        void *p = &dummy;
        unsigned long l = (unsigned long)p;
+       char str[] = "hello world";
 
        plan_tests(2 + 3 + 3 + 3);
        set_some_value(p);
        set_some_value(l);
 
-       callback_onearg(my_callback_onearg, "hello world");
-       callback_onearg(my_callback_onearg_const, "hello world");
-       callback_onearg(my_callback_onearg_volatile, "hello world");
+       callback_onearg(my_callback_onearg, str);
+       callback_onearg(my_callback_onearg_const, str);
+       callback_onearg(my_callback_onearg_volatile, str);
 
-       callback_preargs(my_callback_preargs, "hello world");
+       callback_preargs(my_callback_preargs, str);
 #if 0 /* FIXME */
-       callback_preargs(my_callback_preargs_const, "hello world");
-       callback_preargs(my_callback_preargs_volatile, "hello world");
+       callback_preargs(my_callback_preargs_const, str);
+       callback_preargs(my_callback_preargs_volatile, str);
 #endif
 
-       callback_postargs(my_callback_postargs, "hello world");
+       callback_postargs(my_callback_postargs, str);
 #if 0 /* FIXME */
-       callback_postargs(my_callback_postargs_const, "hello world");
-       callback_postargs(my_callback_postargs_volatile, "hello world");
+       callback_postargs(my_callback_postargs_const, str);
+       callback_postargs(my_callback_postargs_volatile, str);
 #endif
 
        return exit_status();