From ec869672641b16dd49551a7ca44ff271e481b6b7 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Fri, 29 Dec 2006 14:32:52 +0000 Subject: [PATCH] (regerror): Change parameter name err_code. --- src/regex.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/regex.c b/src/regex.c index c0dd6e00ff..b1307743f0 100644 --- a/src/regex.c +++ b/src/regex.c @@ -67,8 +67,8 @@ # define regfree(preg) __regfree (preg) # define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef) # define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags) -# define regerror(errcode, preg, errbuf, errbuf_size) \ - __regerror(errcode, preg, errbuf, errbuf_size) +# define regerror(err_code, preg, errbuf, errbuf_size) \ + __regerror(err_code, preg, errbuf, errbuf_size) # define re_set_registers(bu, re, nu, st, en) \ __re_set_registers (bu, re, nu, st, en) # define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \ @@ -6531,12 +6531,15 @@ regexec (preg, string, nmatch, pmatch, eflags) WEAK_ALIAS (__regexec, regexec) -/* Returns a message corresponding to an error code, ERRCODE, returned - from either regcomp or regexec. We don't use PREG here. */ +/* Returns a message corresponding to an error code, ERR_CODE, returned + from either regcomp or regexec. We don't use PREG here. + + ERR_CODE was previously called ERRCODE, but that name causes an + error with msvc8 compiler. */ size_t -regerror (errcode, preg, errbuf, errbuf_size) - int errcode; +regerror (err_code, preg, errbuf, errbuf_size) + int err_code; const regex_t *preg; char *errbuf; size_t errbuf_size; @@ -6544,15 +6547,15 @@ regerror (errcode, preg, errbuf, errbuf_size) const char *msg; size_t msg_size; - if (errcode < 0 - || errcode >= (sizeof (re_error_msgid) / sizeof (re_error_msgid[0]))) + if (err_code < 0 + || err_code >= (sizeof (re_error_msgid) / sizeof (re_error_msgid[0]))) /* Only error codes returned by the rest of the code should be passed to this routine. If we are given anything else, or if other regex code generates an invalid error code, then the program has a bug. Dump core so we can fix it. */ abort (); - msg = gettext (re_error_msgid[errcode]); + msg = gettext (re_error_msgid[err_code]); msg_size = strlen (msg) + 1; /* Includes the null. */ -- 2.39.2