simplify code so it always returns the same object

[wxWidgets.git] / src / regex / regcomp.c

diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c
index c634d6b1b983d1abf81c50aab8b58a30b8965217..83edc37b34e501990dc26ef832a17070db8b78de 100644 (file)
--- 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) ? (void)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)
 
@@ -2168,7 +2168,7 @@ size_t bufsize;
        if (t->retry != 0)
                sprintf(buf, "%d", t->retry);
        else
-               sprintf(buf, "0x%x", (int)t);   /* may lose bits, that's okay */
+               sprintf(buf, "0x%x", (int)(wxUIntPtr)(t));      /* may lose bits, that's okay */
        return buf;
 }