From 1ad54aa900df6e7105e12dc7eb56f352e40a607f Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 21 Jan 2021 15:09:43 +0100 Subject: [PATCH] replace deprecated index() by strchr() (#51385) --- lasso/xml/tools.c | 4 ++-- tests/basic_tests.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c index 589a795d..96d88a2c 100644 --- a/lasso/xml/tools.c +++ b/lasso/xml/tools.c @@ -2504,7 +2504,7 @@ lasso_xmlURIEscapeStr(const xmlChar *from, const xmlChar *list) list = ""; for (fp = from; *fp; fp++) { - if (isalnum(*fp) || index("._~-", *fp) || index(list, *fp)) + if (isalnum(*fp) || strchr("._~-", *fp) || strchr(list, *fp)) len++; else len += 3; @@ -2514,7 +2514,7 @@ lasso_xmlURIEscapeStr(const xmlChar *from, const xmlChar *list) ri = 0; for (fp = from; *fp; fp++) { - if (isalnum(*fp) || index("._~-", *fp) || index(list, *fp)) { + if (isalnum(*fp) || strchr("._~-", *fp) || strchr(list, *fp)) { result[ri++] = *fp; } else { int msb = (*fp & 0xf0) >> 4; diff --git a/tests/basic_tests.c b/tests/basic_tests.c index 3f0ade0d..f9cfef26 100644 --- a/tests/basic_tests.c +++ b/tests/basic_tests.c @@ -22,7 +22,6 @@ #include #include -#include #include @@ -2128,7 +2127,7 @@ START_TEST(test16_test_get_issuer) lasso_assign_string(request->ProtocolBinding, LASSO_SAML2_METADATA_BINDING_POST); check_good_rc(lasso_login_build_authn_request_msg(spLoginContext)); authnRequestUrl = LASSO_PROFILE(spLoginContext)->msg_url; - qs = index(authnRequestUrl, '?') + 1; + qs = strchr(authnRequestUrl, '?') + 1; issuer = lasso_profile_get_issuer(qs); check_true(lasso_strisequal(issuer, "http://sp5/metadata")); lasso_release_string(issuer); -- 2.30.0