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

fixed bug in wxStrstr() replacement implementation (part of patch 565031)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-06-07 21:04:37 +00:00
parent f5e2134e5b
commit 9f6fe2886f
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/wxchar.cpp
View File

@@ -285,12 +285,20 @@ WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept)
WXDLLEXPORT wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle) WXDLLEXPORT wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle)
{ {
wxChar *fnd; wxCHECK_RET( needle, NULL, _T("NULL argument in wxStrstr") );
while ((fnd = wxStrchr(haystack, *needle))) {
if (!wxStrcmp(fnd, needle)) return fnd; const size_t len = wxStrlen(needle);
haystack = fnd + 1;
} wxChar *fnd;
return (wxChar *)NULL; while ( (fnd = wxStrchr(haystack, *needle)) )
{
if ( !wxStrncmp(fnd, needle, len) )
return fnd;
haystack = fnd + 1;
}
return (wxChar *)NULL;
} }
WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr) WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr)