From d5923e449d67dfe99171f02674e4786b79569cd4 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 27 Jan 2011 11:37:37 +0000 Subject: [PATCH] clang warnings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/regex/regc_color.c | 2 +- src/regex/regc_nfa.c | 2 +- src/regex/regcomp.c | 4 ++-- src/regex/regexec.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/regex/regc_color.c b/src/regex/regc_color.c index b3df484f08..6a07d3e7a5 100644 --- a/src/regex/regc_color.c +++ b/src/regex/regc_color.c @@ -37,7 +37,7 @@ #define CISERR() VISERR(cm->v) -#define CERR(e) VERR(cm->v, (e)) +#define CERR(e) (void)VERR(cm->v, (e)) diff --git a/src/regex/regc_nfa.c b/src/regex/regc_nfa.c index 5f65c8d83a..2db51bc7b9 100644 --- a/src/regex/regc_nfa.c +++ b/src/regex/regc_nfa.c @@ -36,7 +36,7 @@ */ #define NISERR() VISERR(nfa->v) -#define NERR(e) VERR(nfa->v, (e)) +#define NERR(e) (void)VERR(nfa->v, (e)) /* diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c index 4ad457ff95..14b4533136 100644 --- a/src/regex/regcomp.c +++ b/src/regex/regcomp.c @@ -235,11 +235,11 @@ struct vars { #define ISERR() VISERR(v) #define VERR(vv,e) ((vv)->nexttype = EOS, ((vv)->err) ? (vv)->err :\ ((vv)->err = (e))) -#define ERR(e) VERR(v, e) /* record an error */ +#define ERR(e) (void)VERR(v, e) /* record an error */ #define NOERR() {if (ISERR()) return;} /* if error seen, return */ #define NOERRN() {if (ISERR()) return NULL;} /* NOERR with retval */ #define NOERRZ() {if (ISERR()) return 0;} /* NOERR with retval */ -#define INSIST(c, e) ((c) ? 0 : ERR(e)) /* if condition false, error */ +#define INSIST(c, e) (void)((c) ? 0 : ERR(e)) /* if condition false, error */ #define NOTE(b) (v->re->re_info |= (b)) /* note visible condition */ #define EMPTYARC(x, y) newarc(v->nfa, EMPTY, 0, x, y) diff --git a/src/regex/regexec.c b/src/regex/regexec.c index 42e7e18923..756cba131e 100644 --- a/src/regex/regexec.c +++ b/src/regex/regexec.c @@ -110,7 +110,7 @@ struct vars { #define VISERR(vv) ((vv)->err != 0) /* have we seen an error yet? */ #define ISERR() VISERR(v) #define VERR(vv,e) (((vv)->err) ? (vv)->err : ((vv)->err = (e))) -#define ERR(e) VERR(v, e) /* record an error */ +#define ERR(e) (void)VERR(v, e) /* record an error */ #define NOERR() {if (ISERR()) return v->err;} /* if error seen, return it */ #define OFF(p) ((p) - v->start) #define LOFF(p) ((long)OFF(p)) -- 2.47.2