strcase: s/strequal/strcasecompare

some more follow-ups to 811a693b80

diff --git a/lib/ldap.c b/lib/ldap.c
index 6a8cdf8e728056298a96571a79ebccc64f42b5a6..553c161a08c82b3597af658e86a73e6d50ed8dd6 100644 (file)
--- a/lib/ldap.c
+++ b/lib/ldap.c
@@ -708,16 +708,16 @@ static void _ldap_trace (const char *fmt, ...)
  */
 static int str2scope (const char *p)
 {
-  if(strequal(p, "one"))
-     return LDAP_SCOPE_ONELEVEL;
-  if(strequal(p, "onetree"))
-     return LDAP_SCOPE_ONELEVEL;
-  if(strequal(p, "base"))
-     return LDAP_SCOPE_BASE;
-  if(strequal(p, "sub"))
-     return LDAP_SCOPE_SUBTREE;
-  if(strequal(p, "subtree"))
-     return LDAP_SCOPE_SUBTREE;
+  if(strcasecompare(p, "one"))
+    return LDAP_SCOPE_ONELEVEL;
+  if(strcasecompare(p, "onetree"))
+    return LDAP_SCOPE_ONELEVEL;
+  if(strcasecompare(p, "base"))
+    return LDAP_SCOPE_BASE;
+  if(strcasecompare(p, "sub"))
+    return LDAP_SCOPE_SUBTREE;
+  if(strcasecompare(p, "subtree"))
+    return LDAP_SCOPE_SUBTREE;
   return (-1);
 }
 
@@ -776,9 +776,9 @@ static int _ldap_url_parse2(const struct connectdata *conn, LDAPURLDesc *ludp)
   size_t i;
 
   if(!conn->data ||
-      !conn->data->state.path ||
-      conn->data->state.path[0] != '/' ||
-      !checkprefix("LDAP", conn->data->change.url))
+     !conn->data->state.path ||
+     conn->data->state.path[0] != '/' ||
+     !checkprefix("LDAP", conn->data->change.url))
     return LDAP_INVALID_SYNTAX;
 
   ludp->lud_scope = LDAP_SCOPE_BASE;

diff --git a/lib/x509asn1.c b/lib/x509asn1.c
index 0559cb6c4e95c0c4bcf042f2c6aeaee36261acb0..74a511b2dbd3b235282002dcd78152ff8055f462 100644 (file)
--- a/lib/x509asn1.c
+++ b/lib/x509asn1.c
@@ -27,7 +27,7 @@
 
 #include <curl/curl.h>
 #include "urldata.h"
-#include "strequal.h"
+#include "strcase.h"
 #include "hostcheck.h"
 #include "vtls/vtls.h"
 #include "sendf.h"

diff --git a/tests/data/test1301 b/tests/data/test1301
index 4b6fac8b8a045e594c39ae050a0acbe3095b43fb..8506c0005eef453b2d9f66196b93f7729eff81c4 100644 (file)
--- a/tests/data/test1301
+++ b/tests/data/test1301
@@ -2,7 +2,7 @@
 <info>
 <keywords>
 unittest
-curl_strequal
+curl_strcasecompare
 </keywords>
 </info>
 
@@ -16,7 +16,7 @@ none
 unittest
 </features>
  <name>
-curl_strequal unit tests
+curl_strcasecompare unit tests
  </name>
 <tool>
 unit1301