From: Yann Ylavic Date: Tue, 18 Jan 2022 20:51:42 +0000 (+0000) Subject: mod_dav: Follow up to r1897156: Fix warning. X-Git-Tag: 2.5.0-alpha2-ci-test-only~581 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b609581ea29f0ae268ff8136feaa281ecccc1bf;p=thirdparty%2Fapache%2Fhttpd.git mod_dav: Follow up to r1897156: Fix warning. In file included from mod_dav.c:51: mod_dav.c: In function ‘uripath_is_canonical’: mod_dav.c:774:38: error: passing argument 1 of ‘ap_strchr’ discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 774 | dot_pos = strchr(dot_pos + 1, '.')) { | ~~~~~~~~^~~ /home/travis/build/apache/httpd/include/httpd.h:2469:34: note: in definition of macro ‘strchr’ 2469 | # define strchr(s, c) ap_strchr(s,c) | ^ /home/travis/build/apache/httpd/include/httpd.h:2457:36: note: expected ‘char *’ but argument is of type ‘const char *’ 2457 | AP_DECLARE(char *) ap_strchr(char *s, int c); | ~~~~~~^ git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897183 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c index 080fb26cf08..9832bc0207e 100644 --- a/modules/dav/main/mod_dav.c +++ b/modules/dav/main/mod_dav.c @@ -771,7 +771,7 @@ static int uripath_is_canonical(const char *uripath) * starts and endings, i.e. we only need to check for "/./" */ for (dot_pos = memchr(ptr, '.', len); dot_pos; - dot_pos = strchr(dot_pos + 1, '.')) { + dot_pos = ap_strchr_c(dot_pos + 1, '.')) { if (dot_pos > ptr && dot_pos[-1] == '/' && dot_pos[1] == '/') { return 0; }