fix MSVC warnings about possibly uninitialized variables; some reindentation

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

diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c
index 2a7fd6e0b9dbdcf70f3af7dea09370690bf8d355..4ad457ff95a3a526f4489c9dc4c7d31e9d88d995 100644 (file)
--- a/src/regex/regcomp.c
+++ b/src/regex/regcomp.c
@@ -899,7 +899,7 @@ struct subre *top;          /* subtree top */
        case BACKREF:   /* the Feature From The Black Lagoon */
                INSIST(type != LACON, REG_ESUBREG);
                INSIST(v->nextvalue < v->nsubs, REG_ESUBREG);
-               INSIST(v->subs[v->nextvalue] != NULL, REG_ESUBREG);
+               INSIST(v->subs[(int)v->nextvalue] != NULL, REG_ESUBREG);
                NOERR();
                assert(v->nextvalue > 0);
                atom = subre(v, 'b', BACKR, lp, rp);
@@ -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;
 }