From: Joey Adams Date: Thu, 6 Jan 2011 15:50:04 +0000 (-0500) Subject: opt: Fix warnings with gcc-4.5 (same approach as commit 6535bde) X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=af15570a6d911f5b90fbc6f6ecfc9db9cfddcba9 opt: Fix warnings with gcc-4.5 (same approach as commit 6535bde) &*ptr is used in some other macros, but at a glance, they look like cases where the pointer shouldn't be NULL . Didn't change those, and if we get more warnings, we'll cross that bridge when we get to it. For now, I suppose they are just free NULL checks. --- diff --git a/ccan/opt/opt.h b/ccan/opt/opt.h index 034404e9..f9a047ad 100644 --- a/ccan/opt/opt.h +++ b/ccan/opt/opt.h @@ -298,7 +298,7 @@ char *opt_usage_and_exit(const char *extra); /* Resolves to the four parameters for non-arg callbacks. */ #define OPT_CB_NOARG(cb, arg) \ OPT_NOARG, \ - cast_if_any(char *(*)(void *), (cb), &*(cb), \ + cast_if_any(char *(*)(void *), (cb), (cb)+0, \ char *(*)(typeof(*(arg))*), \ char *(*)(const typeof(*(arg))*), \ char *(*)(const void *)), \ @@ -307,11 +307,11 @@ char *opt_usage_and_exit(const char *extra); /* Resolves to the four parameters for arg callbacks. */ #define OPT_CB_ARG(cb, show, arg) \ OPT_HASARG, NULL, \ - cast_if_any(char *(*)(const char *,void *), (cb), &*(cb), \ + cast_if_any(char *(*)(const char *,void *), (cb), (cb)+0, \ char *(*)(const char *, typeof(*(arg))*), \ char *(*)(const char *, const typeof(*(arg))*), \ char *(*)(const char *, const void *)), \ - cast_if_type(void (*)(char buf[], const void *), (show), &*(show), \ + cast_if_type(void (*)(char buf[], const void *), (show), (show)+0, \ void (*)(char buf[], const typeof(*(arg))*)), \ (arg)