aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2016-10-31 09:37:30 +0100
committerDaniel Stenberg <daniel@haxx.se>2016-10-31 09:37:54 +0100
commit44c53cc38bea66b7612a82fa4c9b68884b9167fa (patch)
tree3744671c0a47eb3a48595a2e7f43b1e3fb22acd0
parent532491a27cf97678934741809043040431674b86 (diff)
strcase: s/strequal/strcasecompare
some more follow-ups to 811a693b80
-rw-r--r--lib/ldap.c26
-rw-r--r--lib/x509asn1.c2
-rw-r--r--tests/data/test13014
3 files changed, 16 insertions, 16 deletions
diff --git a/lib/ldap.c b/lib/ldap.c
index 6a8cdf8e7..553c161a0 100644
--- 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 0559cb6c4..74a511b2d 100644
--- 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 4b6fac8b8..8506c0005 100644
--- 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