the 2nd parm to strstr() doesn't lose const-ness, unlike the 1st parm;

thus, AP_DEBUG flavor of strstr() should declare 2nd parm as const char *,
not char *;

this eliminates a warning in mod_ssl-land

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90235 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/httpd.h b/include/httpd.h
index d27682b40a8e4db97246a3888297347e25e4439d..61dffbcf188baed9df090358bc5a2c66dd9eda67 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1545,7 +1545,7 @@ char *ap_strchr(char *s, int c);
 const char *ap_strchr_c(const char *s, int c);
 char *ap_strrchr(char *s, int c);
 const char *ap_strrchr_c(const char *s, int c);
-char *ap_strstr(char *s, char *c);
+char *ap_strstr(char *s, const char *c);
 const char *ap_strstr_c(const char *s, const char *c);
 
 #else

diff --git a/server/util_debug.c b/server/util_debug.c
index f41f697d2d0d125860f8652e743e0015002ba968..46e895d24f85338989a7bda2a468bf65bfe13b5c 100644 (file)
--- a/server/util_debug.c
+++ b/server/util_debug.c
@@ -85,7 +85,7 @@ const char *ap_strrchr_c(const char *s, int c)
 {
     return strrchr(s,c);
 }
-char *ap_strstr(char *s, char *c)
+char *ap_strstr(char *s, const char *c)
 {
     return strstr(s,c);
 }