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

fixed wxStrrchr(s, '\0') bug, added const and non const versions of wxStrchr, wxStrrchr, wxStrstr, ...

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-07-14 19:55:08 +00:00
parent 1fd1922a49
commit 109c7768eb
2 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/wxchar.h
View File

@@ -606,7 +606,9 @@ WXDLLEXPORT int wxToupper(wxChar ch);
#ifdef wxNEED_WX_STRING_H #ifdef wxNEED_WX_STRING_H
WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src); WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src);
WXDLLEXPORT wxChar * wxStrchr(const wxChar *s, wxChar c); WXDLLEXPORT const wxChar * wxStrchr(const wxChar *s, wxChar c);
WXDLLEXPORT wxChar * wxStrchr(wxChar *s, wxChar c)
{ return (wxChar *)wxStrchr((const wxChar *)s, c); }
WXDLLEXPORT int wxStrcmp(const wxChar *s1, const wxChar *s2); WXDLLEXPORT int wxStrcmp(const wxChar *s1, const wxChar *s2);
WXDLLEXPORT int wxStrcoll(const wxChar *s1, const wxChar *s2); WXDLLEXPORT int wxStrcoll(const wxChar *s1, const wxChar *s2);
WXDLLEXPORT wxChar * wxStrcpy(wxChar *dest, const wxChar *src); WXDLLEXPORT wxChar * wxStrcpy(wxChar *dest, const wxChar *src);
@@ -615,10 +617,16 @@ WXDLLEXPORT size_t wxStrlen(const wxChar *s);
WXDLLEXPORT wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n); WXDLLEXPORT wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n);
WXDLLEXPORT int wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n); WXDLLEXPORT int wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n);
WXDLLEXPORT wxChar * wxStrncpy(wxChar *dest, const wxChar *src, size_t n); WXDLLEXPORT wxChar * wxStrncpy(wxChar *dest, const wxChar *src, size_t n);
WXDLLEXPORT wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept); WXDLLEXPORT const wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept);
WXDLLEXPORT wxChar * wxStrrchr(const wxChar *s, wxChar c); WXDLLEXPORT wxChar * wxStrpbrk(wxChar *s, const wxChar *accept)
{ return (wxChar *)wxStrpbrk((const wxChar *)s, accept); }
WXDLLEXPORT const wxChar * wxStrrchr(const wxChar *s, wxChar c);
WXDLLEXPORT wxChar * wxStrrchr(wxChar *s, wxChar c)
{ return (wxChar *)wxStrrchr((const wxChar *)s, c); }
WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept); WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept);
WXDLLEXPORT wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle); WXDLLEXPORT const wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle);
WXDLLEXPORT wxChar *wxStrstr(wxChar *haystack, const wxChar *needle)
{ return (wxChar *)wxStrstr((const wxChar *)haystack, needle); }
WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr); WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr);
WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base); WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base);
WXDLLEXPORT unsigned long int wxStrtoul(const wxChar *nptr, wxChar **endptr, int base); WXDLLEXPORT unsigned long int wxStrtoul(const wxChar *nptr, wxChar **endptr, int base);

47
src/common/wxchar.cpp
View File

@@ -213,10 +213,16 @@ WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src)
return ret; return ret;
} }
WXDLLEXPORT wxChar * wxStrchr(const wxChar *s, wxChar c) WXDLLEXPORT const wxChar * wxStrchr(const wxChar *s, wxChar c)
{ {
while (*s && *s != c) s++; // be careful here as the terminating NUL makes part of the string
return (*s) ? (wxChar *)s : (wxChar *)NULL; while ( *s != c )
{
if ( !*s++ )
return NULL;
}
return s;
} }
WXDLLEXPORT int wxStrcmp(const wxChar *s1, const wxChar *s2) WXDLLEXPORT int wxStrcmp(const wxChar *s1, const wxChar *s2)
@@ -260,20 +266,26 @@ WXDLLEXPORT wxChar * wxStrncpy(wxChar *dest, const wxChar *src, size_t n)
return ret; return ret;
} }
WXDLLEXPORT wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept) WXDLLEXPORT const wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept)
{ {
while (*s && !wxStrchr(accept, *s)) s++; while (*s && !wxStrchr(accept, *s))
return (*s) ? (wxChar *)s : (wxChar *)NULL; s++;
return *s ? s : NULL;
} }
WXDLLEXPORT wxChar * wxStrrchr(const wxChar *s, wxChar c) WXDLLEXPORT const wxChar * wxStrrchr(const wxChar *s, wxChar c)
{ {
wxChar *ret = (wxChar *)NULL; const wxChar *ret = NULL;
while (*s) { do
if (*s == c) ret = (wxChar *)s; {
s++; if ( *s == c )
} ret = s;
return ret; s++;
}
while ( *s );
return ret;
} }
WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept) WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept)
@@ -283,14 +295,15 @@ WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept)
return len; return len;
} }
WXDLLEXPORT wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle) WXDLLEXPORT const wxChar *wxStrstr(const wxChar *haystack, const wxChar *needle)
{ {
wxCHECK_RET( needle, NULL, _T("NULL argument in wxStrstr") ); wxCHECK_RET( needle, NULL, _T("NULL argument in wxStrstr") );
// VZ: this is not exactly the most efficient string search algorithm...
const size_t len = wxStrlen(needle); const size_t len = wxStrlen(needle);
wxChar *fnd; while ( const wxChar *fnd = wxStrchr(haystack, *needle) )
while ( (fnd = wxStrchr(haystack, *needle)) )
{ {
if ( !wxStrncmp(fnd, needle, len) ) if ( !wxStrncmp(fnd, needle, len) )
return fnd; return fnd;
@@ -298,7 +311,7 @@ WXDLLEXPORT wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle)
haystack = fnd + 1; haystack = fnd + 1;
} }
return (wxChar *)NULL; return NULL;
} }
WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr) WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr)