cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add 'wx_' prefix to builtin regfree and regerror

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell 2005-11-23 13:56:08 +00:00
parent 66d84d1130
commit 7553e636a2
4 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/common/regex.cpp
View File

@ -45,12 +45,13 @@
#include <regex.h>
#include "wx/regex.h"
// WXREGEX_USING_BUILTIN defined when using the built-in regex lib
// WXREGEX_IF_NEED_LEN() wrap the len parameter only used with the built-in
// or GNU regex
// WXREGEX_CONVERT_TO_MB defined when the regex lib is using chars and
// wxChar is wide, so conversion must be done
// WXREGEX_CHAR(x) Convert wxChar to wxRegChar
// WXREGEX_USING_BUILTIN defined when using the built-in regex lib
// WXREGEX_USING_RE_SEARCH defined when using re_search in the GNU regex lib
// WXREGEX_IF_NEED_LEN() wrap the len parameter only used with the built-in
// or GNU regex
// WXREGEX_CONVERT_TO_MB defined when the regex lib is using chars and
// wxChar is wide, so conversion must be done
// WXREGEX_CHAR(x) Convert wxChar to wxRegChar
//
#ifdef __REG_NOFRONT
# define WXREGEX_USING_BUILTIN
@ -59,6 +60,7 @@
#else
# ifdef HAVE_RE_SEARCH
# define WXREGEX_IF_NEED_LEN(x) ,x
# define WXREGEX_USING_RE_SEARCH
# else
# define WXREGEX_IF_NEED_LEN(x)
# endif
@ -66,13 +68,15 @@
# define WXREGEX_CONVERT_TO_MB
# endif
# define WXREGEX_CHAR(x) wxConvertWX2MB(x)
# define wx_regfree regfree
# define wx_regerror regerror
#endif
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
#ifndef HAVE_RE_SEARCH
#ifndef WXREGEX_USING_RE_SEARCH
// the array of offsets for the matches, the usual POSIX regmatch_t array.
class wxRegExMatches
@ -92,7 +96,7 @@ private:
regmatch_t *m_matches;
};
#else // HAVE_RE_SEARCH
#else // WXREGEX_USING_RE_SEARCH
// the array of offsets for the matches, the struct used by the GNU lib
class wxRegExMatches
@ -122,7 +126,7 @@ private:
re_registers m_matches;
};
#endif // HAVE_RE_SEARCH
#endif // WXREGEX_USING_RE_SEARCH
// the character type used by the regular expression engine
#ifndef WXREGEX_CONVERT_TO_MB
@ -168,7 +172,7 @@ private:
{
if ( IsValid() )
{
regfree(&m_RegEx);
wx_regfree(&m_RegEx);
}
delete m_Matches;
@ -227,12 +231,12 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode, bool badconv) const
wxString szError;
// first get the string length needed
int len = regerror(errorcode, &m_RegEx, NULL, 0);
int len = wx_regerror(errorcode, &m_RegEx, NULL, 0);
if ( len > 0 )
{
char* szcmbError = new char[++len];
(void)regerror(errorcode, &m_RegEx, szcmbError, len);
(void)wx_regerror(errorcode, &m_RegEx, szcmbError, len);
szError = wxConvertMB2WX(szcmbError);
delete [] szcmbError;
@ -338,7 +342,7 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
return IsValid();
}
#ifdef HAVE_RE_SEARCH
#ifdef WXREGEX_USING_RE_SEARCH
// On GNU, regexec is implemented as a wrapper around re_search. re_search
// requires a length parameter which the POSIX regexec does not have,
@ -363,7 +367,7 @@ static int ReSearch(const regex_t *preg,
return ret >= 0 ? 0 : REG_NOMATCH;
}
#endif // HAVE_RE_SEARCH
#endif // WXREGEX_USING_RE_SEARCH
bool wxRegExImpl::Matches(const wxRegChar *str,
int flags
@ -393,7 +397,7 @@ bool wxRegExImpl::Matches(const wxRegChar *str,
// do match it
#if defined WXREGEX_USING_BUILTIN
int rc = wx_re_exec(&self->m_RegEx, str, len, NULL, m_nMatches, matches, flagsRE);
#elif defined HAVE_RE_SEARCH
#elif defined WXREGEX_USING_RE_SEARCH
int rc = str ? ReSearch(&self->m_RegEx, str, len, matches, flagsRE) : REG_BADPAT;
#else
int rc = str ? regexec(&self->m_RegEx, str, m_nMatches, matches, flagsRE) : REG_BADPAT;

2
src/regex/regerror.c
View File

@ -50,7 +50,7 @@ static struct rerr {
*/
/* ARGSUSED */
size_t /* actual space needed (including NUL) */
regerror(rxerrcode, preg, errbuf, errbuf_size)
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) */

4
src/regex/regex.h
View File

@ -318,8 +318,8 @@ int regexec _ANSI_ARGS_((regex_t *, __REG_CONST char *, size_t, regmatch_t [], i
#ifdef __REG_WIDE_T
int __REG_WIDE_EXEC _ANSI_ARGS_((regex_t *, __REG_CONST __REG_WIDE_T *, size_t, rm_detail_t *, size_t, regmatch_t [], int));
#endif
re_void regfree _ANSI_ARGS_((regex_t *));
extern size_t regerror _ANSI_ARGS_((int, __REG_CONST regex_t *, char *, size_t));
re_void wx_regfree _ANSI_ARGS_((regex_t *));
extern size_t wx_regerror _ANSI_ARGS_((int, __REG_CONST regex_t *, char *, size_t));
/* automatically gathered by fwd; do not hand-edit */
/* =====^!^===== end forwards =====^!^===== */

2
src/regex/regfree.c
View File

@ -44,7 +44,7 @@
* Ignoring invocation with NULL is a convenience.
*/
VOID
regfree(re)
wx_regfree(re)
regex_t *re;
{
if (re == NULL)