httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1715736 - in /httpd/httpd/trunk: include/httpd.h server/util.c
Date Mon, 23 Nov 2015 08:36:35 GMT
Author: ylavic
Date: Mon Nov 23 08:36:35 2015
New Revision: 1715736

URL: http://svn.apache.org/viewvc?rev=1715736&view=rev
Log:
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).

Modified:
    httpd/httpd/trunk/include/httpd.h
    httpd/httpd/trunk/server/util.c

Modified: httpd/httpd/trunk/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/httpd.h?rev=1715736&r1=1715735&r2=1715736&view=diff
==============================================================================
--- httpd/httpd/trunk/include/httpd.h (original)
+++ httpd/httpd/trunk/include/httpd.h Mon Nov 23 08:36:35 2015
@@ -2446,7 +2446,7 @@ AP_DECLARE(int) ap_array_str_contains(co
  *         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
  *         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
 }

Modified: httpd/httpd/trunk/server/util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util.c?rev=1715736&r1=1715735&r2=1715736&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util.c (original)
+++ httpd/httpd/trunk/server/util.c Mon Nov 23 08:36:35 2015
@@ -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
     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;



Mime
View raw message