From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 23 Nov 2015 08:36:35 +0000 (+0000)
Subject: Before they are used, rename ap_str[n]casecmp() to ap_casecmpstr[n]() to match
X-Git-Tag: 2.5.0-alpha~2606
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ebe2d558b0a4b4490194f926db727f81de36a92;p=thirdparty%2Fapache%2Fhttpd.git

Before they are used, rename ap_str[n]casecmp() to ap_casecmpstr[n]() to match
what will probably be their APR names, avoiding any confusion wrt <strings.h>'s
functions (semantic).


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

diff --git a/include/httpd.h b/include/httpd.h
index b17898e34a6..855733df50e 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -2446,7 +2446,7 @@ AP_DECLARE(int) ap_array_str_contains(const apr_array_header_t *array,
  *         if s1 is lexicographically greater than, equal to, or less
  *         than s2 ignoring case.
  */
-AP_DECLARE(int) ap_strcasecmp(const char *s1, const char *s2);
+AP_DECLARE(int) ap_casecmpstr(const char *s1, const char *s2);
 
 /**
  * Known-fast version of strncasecmp(): ASCII case-folding, POSIX compliant
@@ -2457,7 +2457,7 @@ AP_DECLARE(int) ap_strcasecmp(const char *s1, const char *s2);
  *         if s1 is lexicographically greater than, equal to, or less
  *         than s2 ignoring case.
  */
-AP_DECLARE(int) ap_strncasecmp(const char *s1, const char *s2, apr_size_t n);
+AP_DECLARE(int) ap_casecmpstrn(const char *s1, const char *s2, apr_size_t n);
 
 #ifdef __cplusplus
 }
diff --git a/server/util.c b/server/util.c
index f1215884b9c..c4316c7bfbb 100644
--- a/server/util.c
+++ b/server/util.c
@@ -3259,7 +3259,7 @@ static const unsigned char ucharmap[] = {
 };
 #endif
 
-AP_DECLARE(int) ap_strcasecmp(const char *s1, const char *s2)
+AP_DECLARE(int) ap_casecmpstr(const char *s1, const char *s2)
 {
     const unsigned char *ps1 = (const unsigned char *) s1;
     const unsigned char *ps2 = (const unsigned char *) s2;
@@ -3272,7 +3272,7 @@ AP_DECLARE(int) ap_strcasecmp(const char *s1, const char *s2)
     return (ucharmap[*ps1] - ucharmap[*--ps2]);
 }
 
-AP_DECLARE(int) ap_strncasecmp(const char *s1, const char *s2, apr_size_t n)
+AP_DECLARE(int) ap_casecmpstrn(const char *s1, const char *s2, apr_size_t n)
 {
     const unsigned char *ps1 = (const unsigned char *) s1;
     const unsigned char *ps2 = (const unsigned char *) s2;