From 918b3aff5e9a012b2cdaae30c6012be1aa9e595b Mon Sep 17 00:00:00 2001 From: glx Date: Tue, 26 Jan 2010 14:04:56 +0000 Subject: (svn r18919) -Fix (r15371): strcasestr() return should not be const --- src/string.cpp | 4 ++-- src/string_func.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/string.cpp b/src/string.cpp index d9e27857d..2bd747535 100644 --- a/src/string.cpp +++ b/src/string.cpp @@ -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(haystack); haystack++; hay_len--; diff --git a/src/string_func.h b/src/string_func.h index e0280490f..2ff5f0439 100644 --- a/src/string_func.h +++ b/src/string_func.h @@ -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 */ -- cgit v1.2.3-54-g00ecf