From: Frank Lichtenheld <[email protected]> Both these work perfectly fine but are discouraged and might cause warnings by compilers.
Identified by cppcheck. Change-Id: I04e35928244e6ecda8c58285a812516662b50742 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Heiko Hund <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1673 --- This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master. Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1673 This mail reflects revision 2 of this Change. Acked-by according to Gerrit (reflected above): Heiko Hund <[email protected]> diff --git a/src/openvpn/cryptoapi.c b/src/openvpn/cryptoapi.c index e17936a..bf80bbd 100644 --- a/src/openvpn/cryptoapi.c +++ b/src/openvpn/cryptoapi.c @@ -235,7 +235,7 @@ if (pvext && cbext >= sizeof(CERT_TEMPLATE_EXT)) { const CERT_TEMPLATE_EXT *cte = (const CERT_TEMPLATE_EXT *)pvext; - if (!stricmp(cert_prop, cte->pszObjId)) + if (!_stricmp(cert_prop, cte->pszObjId)) { /* found direct OID match with certificate property specified */ gc_free(&gc); @@ -244,7 +244,7 @@ const CRYPT_OID_INFO *tmpl_oid = find_oid(CRYPT_OID_INFO_NAME_KEY, tmpl_name, CRYPT_TEMPLATE_OID_GROUP_ID); - if (tmpl_oid && !stricmp(tmpl_oid->pszOID, cte->pszObjId)) + if (tmpl_oid && !_stricmp(tmpl_oid->pszOID, cte->pszObjId)) { /* found OID match in extension against resolved key */ gc_free(&gc); diff --git a/src/openvpnmsica/openvpnmsica.c b/src/openvpnmsica/openvpnmsica.c index d698c04..95e457c 100644 --- a/src/openvpnmsica/openvpnmsica.c +++ b/src/openvpnmsica/openvpnmsica.c @@ -508,7 +508,7 @@ *iTicks += MSICA_ADAPTER_TICK_SIZE; break; } - else if (wcsicmp(szDisplayName, pAdapterOther->szName) == 0) + else if (_wcsicmp(szDisplayName, pAdapterOther->szName) == 0) { /* Adapter with a same name found. */ for (LPCWSTR hwid = pAdapterOther->szzHardwareIDs;; hwid += wcslen(hwid) + 1) @@ -521,7 +521,7 @@ dwResult = ERROR_ALREADY_EXISTS; goto cleanup_pAdapterList; } - else if (wcsicmp(hwid, szHardwareId) == 0) + else if (_wcsicmp(hwid, szHardwareId) == 0) { /* This is an adapter with the requested hardware ID. We already have what we * want! */ @@ -583,7 +583,7 @@ for (struct tap_adapter_node *pAdapter = pAdapterList; pAdapter != NULL; pAdapter = pAdapter->pNext) { - if (wcsicmp(szDisplayName, pAdapter->szName) == 0) + if (_wcsicmp(szDisplayName, pAdapter->szName) == 0) { /* Adapter found. */ WCHAR szArgument[8 /*disable=|enable=|delete=*/ @@ -1083,7 +1083,7 @@ for (struct tap_adapter_node *pAdapter = pAdapterList; pAdapter != NULL; pAdapter = pAdapter->pNext) { - if (wcsicmp(szName, pAdapter->szName) == 0) + if (_wcsicmp(szName, pAdapter->szName) == 0) { /* Adapter found. */ dwResult = tap_delete_adapter(NULL, &pAdapter->guid, &bRebootRequired); _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
