Fix some prototypes.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13054 a5019735-40e9-0310-863c-91ae7b9d1cf9

diff --git a/coregrind/m_libcbase.c b/coregrind/m_libcbase.c
index 866bb78f767827ffb42468c0a100acc860fb291d..a5adac585f499e52746ac37695c8743981bcbc3f 100644 (file)
--- a/coregrind/m_libcbase.c
+++ b/coregrind/m_libcbase.c
@@ -362,7 +362,7 @@ Int VG_(strncasecmp) ( const Char* s1, const Char* s2, SizeT nmax )
    }
 }
 
-Char* VG_(strstr) ( const Char* haystack, Char* needle )
+Char* VG_(strstr) ( const Char* haystack, const Char* needle )
 {
    SizeT n; 
    if (haystack == NULL)
@@ -377,7 +377,7 @@ Char* VG_(strstr) ( const Char* haystack, Char* needle )
    }
 }
 
-Char* VG_(strcasestr) ( const Char* haystack, Char* needle )
+Char* VG_(strcasestr) ( const Char* haystack, const Char* needle )
 {
    Int n; 
    if (haystack == NULL)
@@ -508,7 +508,7 @@ SizeT VG_(strspn) ( const Char* s, const Char* accpt )
    return count;
 }
 
-SizeT VG_(strcspn) ( const Char* s, const char* reject )
+SizeT VG_(strcspn) ( const Char* s, const Char* reject )
 {
    SizeT count = 0;
    while (*s != '\0') {

diff --git a/include/pub_tool_libcbase.h b/include/pub_tool_libcbase.h
index 14c917b43fb862c18e80174ebb08f38134db8e68..304aa0c81950ad57b982eb03e3c88b3a33b54cb4 100644 (file)
--- a/include/pub_tool_libcbase.h
+++ b/include/pub_tool_libcbase.h
@@ -92,12 +92,12 @@ extern Int   VG_(strcmp)         ( const Char* s1, const Char* s2 );
 extern Int   VG_(strcasecmp)     ( const Char* s1, const Char* s2 );
 extern Int   VG_(strncmp)        ( const Char* s1, const Char* s2, SizeT nmax );
 extern Int   VG_(strncasecmp)    ( const Char* s1, const Char* s2, SizeT nmax );
-extern Char* VG_(strstr)         ( const Char* haystack, Char* needle );
-extern Char* VG_(strcasestr)     ( const Char* haystack, Char* needle );
+extern Char* VG_(strstr)         ( const Char* haystack, const Char* needle );
+extern Char* VG_(strcasestr)     ( const Char* haystack, const Char* needle );
 extern Char* VG_(strchr)         ( const Char* s, Char c );
 extern Char* VG_(strrchr)        ( const Char* s, Char c );
 extern SizeT VG_(strspn)         ( const Char* s, const Char* accpt );
-extern SizeT VG_(strcspn)        ( const Char* s, const char* reject );
+extern SizeT VG_(strcspn)        ( const Char* s, const Char* reject );
 
 /* strtok* functions and some parsing utilities. */
 extern Char* VG_(strtok_r)       (Char* s, const Char* delim, Char** saveptr);