From: Jeff Trawick <trawick@apache.org>
Date: Mon, 10 Jun 2013 18:43:45 +0000 (+0000)
Subject: const goodness with nasty strrchr and strchr functions
X-Git-Tag: 2.5.0-alpha~5349
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e7f76f56c69a0d7e006ab3933ee3c5b8946a5fd;p=apache

const goodness with nasty strrchr and strchr functions
(resolve warning in maintainer mode)


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

diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
index 38080fdbcc..af60a39b84 100644
--- a/modules/cache/cache_storage.c
+++ b/modules/cache/cache_storage.c
@@ -571,17 +571,17 @@ static apr_status_t cache_canonicalise_key(request_rec *r, apr_pool_t* p,
         identifier = (char **) conf->ignore_session_id->elts;
         for (i = 0; i < conf->ignore_session_id->nelts; i++, identifier++) {
             int len;
-            char *param;
+            const char *param;
 
             len = strlen(*identifier);
             /*
              * Check that we have a parameter separator in the last segment
              * of the path and that the parameter matches our identifier
              */
-            if ((param = strrchr(path, ';'))
+            if ((param = ap_strrchr_c(path, ';'))
                     && !strncmp(param + 1, *identifier, len)
                     && (*(param + len + 1) == '=')
-                    && !strchr(param + len + 2, '/')) {
+                    && !ap_strchr_c(param + len + 2, '/')) {
                 path = apr_pstrndup(p, path, param - path);
                 continue;
             }
@@ -612,7 +612,7 @@ static apr_status_t cache_canonicalise_key(request_rec *r, apr_pool_t* p,
                     }
                 }
                 if (param) {
-                    char *amp;
+                    const char *amp;
 
                     if (querystring != param) {
                         querystring = apr_pstrndup(p, querystring,
@@ -622,7 +622,7 @@ static apr_status_t cache_canonicalise_key(request_rec *r, apr_pool_t* p,
                         querystring = "";
                     }
 
-                    if ((amp = strchr(param + len + 1, '&'))) {
+                    if ((amp = ap_strchr_c(param + len + 1, '&'))) {
                         querystring = apr_pstrcat(p, querystring, amp + 1,
                                 NULL);
                     }