X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/294645ebe84bd7004a526e74bd47addd72a1222e..41b93cd7d796a9b635f36b7f14140a8c90f5d71d:/src/regex/regerror.c diff --git a/src/regex/regerror.c b/src/regex/regerror.c index aca13aade0..7646ba2fb6 100644 --- a/src/regex/regerror.c +++ b/src/regex/regerror.c @@ -50,8 +50,8 @@ static struct rerr { */ /* ARGSUSED */ size_t /* actual space needed (including NUL) */ -regerror(errcode, preg, errbuf, errbuf_size) -int errcode; /* error code, or REG_ATOI or REG_ITOA */ +wx_regerror(rxerrcode, preg, errbuf, errbuf_size) +int rxerrcode; /* error code, or REG_ATOI or REG_ITOA */ CONST regex_t *preg; /* associated regex_t (unused at present) */ char *errbuf; /* result buffer (unless errbuf_size==0) */ size_t errbuf_size; /* available space in errbuf, can be 0 */ @@ -62,7 +62,7 @@ size_t errbuf_size; /* available space in errbuf, can be 0 */ size_t len; int icode; - switch (errcode) { + switch (rxerrcode) { case REG_ATOI: /* convert name to number */ for (r = rerrs; r->code >= 0; r++) if (strcmp(r->name, errbuf) == 0) @@ -84,12 +84,12 @@ size_t errbuf_size; /* available space in errbuf, can be 0 */ break; default: /* a real, normal error code */ for (r = rerrs; r->code >= 0; r++) - if (r->code == errcode) + if (r->code == rxerrcode) break; if (r->code >= 0) msg = r->explain; else { /* unknown; say so */ - sprintf(convbuf, unk, errcode); + sprintf(convbuf, unk, rxerrcode); msg = convbuf; } break;