From 3d27344a5dc4b56197533876a8f5f4a78406c829 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 21 Mar 2011 21:01:35 +1030 Subject: [PATCH] typesafe: fix warnings with gcc's -Wpointer-arith In particular, avoid doing arithmetic on NULL; decay the function to a pointer using a trinary conditional instead. --- ccan/typesafe_cb/typesafe_cb.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/ccan/typesafe_cb/typesafe_cb.h b/ccan/typesafe_cb/typesafe_cb.h index 7347b7b2..4bc2e2da 100644 --- a/ccan/typesafe_cb/typesafe_cb.h +++ b/ccan/typesafe_cb/typesafe_cb.h @@ -106,10 +106,10 @@ * #define register_callback(fn, arg) \ * _register_callback(typesafe_cb_def(void, (fn), (arg)), (arg)) */ -#define typesafe_cb_def(rtype, fn, arg) \ - cast_if_any(rtype (*)(void *), (fn), (fn)+0, \ - rtype (*)(typeof(*arg)*), \ - rtype (*)(const typeof(*arg)*), \ +#define typesafe_cb_def(rtype, fn, arg) \ + cast_if_any(rtype (*)(void *), (fn), 0?(fn):(fn), \ + rtype (*)(typeof(*arg)*), \ + rtype (*)(const typeof(*arg)*), \ rtype (*)(volatile typeof(*arg)*)) /** @@ -127,7 +127,8 @@ * _register_callback(typesafe_cb_exact(void, (fn), (arg)), (arg)) */ #define typesafe_cb_exact(rtype, fn, arg) \ - cast_if_type(rtype (*)(void *), (fn), (fn)+0, rtype (*)(typeof(arg))) + cast_if_type(rtype (*)(void *), (fn), 0?(fn):(fn), \ + rtype (*)(typeof(arg))) /** * typesafe_cb_const - cast a const callback function if it matches the arg @@ -166,7 +167,7 @@ * (arg)) */ #define typesafe_cb_preargs(rtype, fn, arg, ...) \ - cast_if_type(rtype (*)(__VA_ARGS__, void *), (fn), (fn)+0, \ + cast_if_type(rtype (*)(__VA_ARGS__, void *), (fn), 0?(fn):(fn), \ rtype (*)(__VA_ARGS__, typeof(arg))) /** @@ -185,7 +186,7 @@ * (arg)) */ #define typesafe_cb_postargs(rtype, fn, arg, ...) \ - cast_if_type(rtype (*)(void *, __VA_ARGS__), (fn), (fn)+0, \ + cast_if_type(rtype (*)(void *, __VA_ARGS__), (fn), 0?(fn):(fn), \ rtype (*)(typeof(arg), __VA_ARGS__)) /** @@ -210,7 +211,8 @@ * typesafe_cb_cmp(int, (cmpfn), (base)), (arg)) */ #define typesafe_cb_cmp(rtype, cmpfn, arg) \ - cast_if_type(rtype (*)(const void *, const void *), (cmpfn), (cmpfn)+0, \ + cast_if_type(rtype (*)(const void *, const void *), \ + (cmpfn), 0?(cmpfn):(cmpfn), \ rtype (*)(const typeof(*arg)*, const typeof(*arg)*)) #endif /* CCAN_CAST_IF_TYPE_H */ -- 2.39.2