missing commit

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

diff --git a/src/regex/regexec.c b/src/regex/regexec.c
index 41d49bdab53e75eff2522f238332b34ec610b8c5..756cba131ec0e669d013ee32e6143e4da2737d01 100644 (file)
--- 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        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))
 #define        NOERR() {if (ISERR()) return v->err;}   /* if error seen, return it */
 #define        OFF(p)  ((p) - v->start)
 #define        LOFF(p) ((long)OFF(p))


@@ -360,7 +360,7 @@ struct colormap *cm;
                freedfa(s);
                return v->err;
        }
                freedfa(s);
                return v->err;
        }

-
+    cold = NULL;// WX: fix gcc warnings about cold being possibly uninitialized

        ret = cfindloop(v, cnfa, cm, d, s, &cold);
 
        freedfa(d);
        ret = cfindloop(v, cnfa, cm, d, s, &cold);
 
        freedfa(d);