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

Cleaned up regex.cpp

Browse Source 
fixed strlen problem in regex
many other things related to cleanup of regex.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2003-12-30 22:21:00 +00:00
parent 9965cadbde
commit c5feba0ea3
5 changed files with 53 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/regex/regcomp.c
View File

@@ -188,6 +188,7 @@ extern int wx_ispunct(wx_wchar c);
extern int wx_isspace(wx_wchar c);
extern wx_wchar wx_toupper(wx_wchar c);
extern wx_wchar wx_tolower(wx_wchar c);
extern int wx_strlen(const wx_wchar* szString);
static int nmcces(struct vars *);
static int nleaders(struct vars *);
static struct cvec *allmcces(struct vars *, struct cvec *);
@@ -296,18 +297,7 @@ regcomp(regex_t *re,
const chr *string,
int flags)
{
size_t nLen = 0;
chr* s2 = (chr*) string;
if (string && *string)
{
while(*++s2);
}
nLen = ((s2 - string) / sizeof(chr));
return wx_regcomp(re, string, nLen, flags);
return wx_regcomp(re, string, wx_strlen(string), flags);
}
int
wx_regcomp(regex_t *re,