curl_strequal: part of public API/ABI, needs to be kept

These two public functions have been mentioned as deprecated since a
very long time but since they are still part of the API and ABI we need
to keep them around.

diff --git a/lib/curlx.h b/lib/curlx.h
index 426467b7fba4daec54588fa8632257d8879da197..101491b842d416d7dbf31c7a164953f9a3d97d8f 100644 (file)
--- a/lib/curlx.h
+++ b/lib/curlx.h
@@ -73,8 +73,8 @@
 */
 
 #define curlx_getenv curl_getenv
-#define curlx_strcasecompare curl_strcasecompare
-#define curlx_strncasecompare curl_strncasecompare
+#define curlx_strcasecompare curl_strequal
+#define curlx_strncasecompare curl_strnequal
 #define curlx_mvsnprintf curl_mvsnprintf
 #define curlx_msnprintf curl_msnprintf
 #define curlx_maprintf curl_maprintf

diff --git a/lib/strcase.c b/lib/strcase.c
index 22b9692e2db50eb28d5542ecde0014f54dcf49f7..5f2b700e0aef5963ae2fc28fc588bb82b8a26c45 100644 (file)
--- a/lib/strcase.c
+++ b/lib/strcase.c
@@ -102,7 +102,7 @@ char Curl_raw_toupper(char in)
  * @unittest: 1301
  */
 
-int curl_strcasecompare(const char *first, const char *second)
+int Curl_strcasecompare(const char *first, const char *second)
 {
   while(*first && *second) {
     if(Curl_raw_toupper(*first) != Curl_raw_toupper(*second))
@@ -120,7 +120,7 @@ int curl_strcasecompare(const char *first, const char *second)
 /*
  * @unittest: 1301
  */
-int curl_strncasecompare(const char *first, const char *second, size_t max)
+int Curl_strncasecompare(const char *first, const char *second, size_t max)
 {
   while(*first && *second && max) {
     if(Curl_raw_toupper(*first) != Curl_raw_toupper(*second)) {
@@ -150,3 +150,14 @@ void Curl_strntoupper(char *dest, const char *src, size_t n)
     *dest++ = Curl_raw_toupper(*src);
   } while(*src++ && --n);
 }
+
+/* --- public functions --- */
+
+int curl_strequal(const char *first, const char *second)
+{
+  return Curl_strcasecompare(first, second);
+}
+int curl_strnequal(const char *first, const char *second, size_t max)
+{
+  return Curl_strncasecompare(first, second, max);
+}

diff --git a/lib/strcase.h b/lib/strcase.h
index a790653c6975b8ff5b3169420c70f710f5c3ecf7..932d79321e1c48a77be2ceafb97e9ef3cf4b3a3c 100644 (file)
--- a/lib/strcase.h
+++ b/lib/strcase.h
@@ -32,11 +32,11 @@
  * non-ascii.
  */
 
-#define strcasecompare(a,b) curl_strcasecompare(a,b)
-#define strncasecompare(a,b,c) curl_strncasecompare(a,b,c)
+#define strcasecompare(a,b) Curl_strcasecompare(a,b)
+#define strncasecompare(a,b,c) Curl_strncasecompare(a,b,c)
 
-int curl_strcasecompare(const char *first, const char *second);
-int curl_strncasecompare(const char *first, const char *second, size_t max);
+int Curl_strcasecompare(const char *first, const char *second);
+int Curl_strncasecompare(const char *first, const char *second, size_t max);
 
 char Curl_raw_toupper(char in);
 

diff --git a/src/tool_writeout.c b/src/tool_writeout.c
index 8b709cbe34d29e30fcb99b3cf1545a68702dbe63..6e94afe4252c49a1c99fffa467a9043d52ea400a 100644 (file)
--- a/src/tool_writeout.c
+++ b/src/tool_writeout.c
@@ -126,7 +126,7 @@ void ourWriteOut(CURL *curl, struct OutStruct *outs, const char *writeinfo)
           keepit = *end;
           *end = 0; /* zero terminate */
           for(i = 0; replacements[i].name; i++) {
-            if(curl_strcasecompare(ptr, replacements[i].name)) {
+            if(curl_strequal(ptr, replacements[i].name)) {
               match = TRUE;
               switch(replacements[i].id) {
               case VAR_EFFECTIVE_URL: