Use strncaseeq instead of strncasecmp

diff --git a/src/conftest/actions.c b/src/conftest/actions.c
index 71e172833e0ab6db0b1554f12fe7afafba38eb8f..e66e9d7f12d1873f7280e298512f55d6b4ba712b 100644 (file)
--- a/src/conftest/actions.c
+++ b/src/conftest/actions.c
@@ -273,7 +273,7 @@ static void load_action(settings_t *settings, char *action)
 
        for (i = 0; i < countof(actions); i++)
        {
-               if (strncasecmp(actions[i].name, action, strlen(actions[i].name)) == 0)
+               if (strncaseeq(actions[i].name, action, strlen(actions[i].name)))
                {
                        int delay;
                        char *config;

diff --git a/src/conftest/conftest.c b/src/conftest/conftest.c
index 304cacf02da35fe9c53ad97c149d42c9d433b37f..0c1690ab065055cacd0a3ce7be7de6a81801ece6 100644 (file)
--- a/src/conftest/conftest.c
+++ b/src/conftest/conftest.c
@@ -100,7 +100,7 @@ static bool load_trusted_cert(settings_t *settings, bool trusted)
        {
                certificate_t *cert = NULL;
 
-               if (strcaseeq(key, "x509"))
+               if (strncaseeq(key, "x509"))
                {
                        cert = lib->creds->create(lib->creds, CRED_CERTIFICATE,
                                                        CERT_X509, BUILD_FROM_FILE, value, BUILD_END);

diff --git a/src/conftest/hooks/add_notify.c b/src/conftest/hooks/add_notify.c
index 00833265f9dd2612b9f779d466486e1f62ecf497..de46ca81f850d4277de067e2d8dac27b1d17be55 100644 (file)
--- a/src/conftest/hooks/add_notify.c
+++ b/src/conftest/hooks/add_notify.c
@@ -80,7 +80,7 @@ METHOD(listener_t, message, bool,
                                return TRUE;
                        }
                }
-               if (strncasecmp(this->data, "0x", 2) == 0)
+               if (strncaseeq(this->data, "0x", 2))
                {
                        data = chunk_skip(chunk_create(this->data, strlen(this->data)), 2);
                        data = chunk_from_hex(data, NULL);

diff --git a/src/conftest/hooks/add_payload.c b/src/conftest/hooks/add_payload.c
index 845d512aa013c99480309be68a4658f57b6cd5f6..03a47cc235362f63e7996088832114b1b4b3bf55 100644 (file)
--- a/src/conftest/hooks/add_payload.c
+++ b/src/conftest/hooks/add_payload.c
@@ -98,7 +98,7 @@ METHOD(listener_t, message, bool,
                        }
                        enumerator->destroy(enumerator);
                }
-               if (strncasecmp(this->data, "0x", 2) == 0)
+               if (strncaseeq(this->data, "0x", 2))
                {
                        data = chunk_skip(chunk_create(this->data, strlen(this->data)), 2);
                        data = chunk_from_hex(data, NULL);

diff --git a/src/conftest/hooks/unencrypted_notify.c b/src/conftest/hooks/unencrypted_notify.c
index 8737158adadc59d8603e2b77aa170759b2cec6fc..80bdc64b7a4afa1d79cd546ad88dd78afdee117b 100644 (file)
--- a/src/conftest/hooks/unencrypted_notify.c
+++ b/src/conftest/hooks/unencrypted_notify.c
@@ -75,7 +75,7 @@ METHOD(listener_t, ike_updown, bool,
                                return TRUE;
                        }
                }
-               if (strncasecmp(this->data, "0x", 2) == 0)
+               if (strncaseeq(this->data, "0x", 2))
                {
                        data = chunk_skip(chunk_create(this->data, strlen(this->data)), 2);
                        data = chunk_from_hex(data, NULL);