gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-04 05:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r18919) -Fix (r15371): strcasestr() return should not be const

Browse Source
This commit is contained in:
glx 2010-01-26 14:04:56 +00:00
parent 078e1edabc
commit 918b3aff5e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/string.cpp
View File

@ -385,12 +385,12 @@ char *strndup(const char *s, size_t len)
#endif /* !_GNU_SOURCE */
#ifdef DEFINE_STRCASESTR
const char *strcasestr(const char *haystack, const char *needle)
char *strcasestr(const char *haystack, const char *needle)
{
size_t hay_len = strlen(haystack);
size_t needle_len = strlen(needle);
while (hay_len >= needle_len) {
if (strncasecmp(haystack, needle, needle_len) == 0) return haystack;
if (strncasecmp(haystack, needle, needle_len) == 0) return const_cast<char *>(haystack);
haystack++;
hay_len--;

2
src/string_func.h
View File

@ -256,7 +256,7 @@ char *strndup(const char *s, size_t len);
# undef DEFINE_STRCASESTR
#else
# define DEFINE_STRCASESTR
const char *strcasestr(const char *haystack, const char *needle);
char *strcasestr(const char *haystack, const char *needle);
#endif /* strcasestr is available */
#endif /* STRING_FUNC_H */