From 49b55331e47900e0c0188f4541279aa8acf8ed3d Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 5 May 2022 13:37:30 +0200 Subject: [PATCH] Unify std::vector::data() typecasting When used in place of void*, typecasting is redundant. In other situations use reinterpret_cast() rather than C-style typecasting. Signed-off-by: Simon Rozman --- include/WinStd/Crypt.h | 14 +++++++------- include/WinStd/ETW.h | 2 +- include/WinStd/Win.h | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/WinStd/Crypt.h b/include/WinStd/Crypt.h index fe7576c8..5081e782 100644 --- a/include/WinStd/Crypt.h +++ b/include/WinStd/Crypt.h @@ -68,7 +68,7 @@ static _Success_(return != 0) BOOL WINAPI CertGetCertificateContextProperty(_In_ return TRUE; } else if (GetLastError() == ERROR_MORE_DATA) { aData.resize((dwSize + sizeof(_Ty) - 1) / sizeof(_Ty)); - if (CertGetCertificateContextProperty(pCertContext, dwPropId, (BYTE*)aData.data(), &dwSize)) + if (CertGetCertificateContextProperty(pCertContext, dwPropId, aData.data(), &dwSize)) return TRUE; } @@ -93,7 +93,7 @@ static _Success_(return != 0) BOOL CryptGetHashParam(_In_ HCRYPTHASH hHash, _In_ return TRUE; } else if (GetLastError() == ERROR_MORE_DATA) { aData.resize((dwSize + sizeof(_Ty) - 1) / sizeof(_Ty)); - if (CryptGetHashParam(hHash, dwParam, (BYTE*)aData.data(), &dwSize, dwFlags)) + if (CryptGetHashParam(hHash, dwParam, reinterpret_cast(aData.data()), &dwSize, dwFlags)) return TRUE; } @@ -130,7 +130,7 @@ static _Success_(return != 0) BOOL CryptGetKeyParam(_In_ HCRYPTKEY hKey, _In_ DW return TRUE; } else if (GetLastError() == ERROR_MORE_DATA) { aData.resize((dwSize + sizeof(_Ty) - 1) / sizeof(_Ty)); - if (CryptGetKeyParam(hKey, dwParam, (BYTE*)aData.data(), &dwSize, dwFlags)) + if (CryptGetKeyParam(hKey, dwParam, reinterpret_cast(aData.data()), &dwSize, dwFlags)) return TRUE; } @@ -161,7 +161,7 @@ static _Success_(return != 0) BOOL CryptExportKey(_In_ HCRYPTKEY hKey, _In_ HCRY if (CryptExportKey(hKey, hExpKey, dwBlobType, dwFlags, NULL, &dwKeyBLOBSize)) { aData.resize((dwKeyBLOBSize + sizeof(_Ty) - 1) / sizeof(_Ty)); - if (CryptExportKey(hKey, hExpKey, dwBlobType, dwFlags, aData.data(), &dwKeyBLOBSize)) + if (CryptExportKey(hKey, hExpKey, dwBlobType, dwFlags, reinterpret_cast(aData.data()), &dwKeyBLOBSize)) return TRUE; } @@ -184,7 +184,7 @@ static _Success_(return != 0) BOOL CryptEncrypt(_In_ HCRYPTKEY hKey, _In_opt_ HC if (dwBufLen) { aData.resize(dwBufLen); - if (CryptEncrypt(hKey, hHash, Final, dwFlags, (BYTE*)aData.data(), &dwEncLen, dwBufLen)) { + if (CryptEncrypt(hKey, hHash, Final, dwFlags, reinterpret_cast(aData.data()), &dwEncLen, dwBufLen)) { // Encryption succeeded. assert(dwEncLen <= dwBufLen); if (dwEncLen < dwBufLen) @@ -203,7 +203,7 @@ static _Success_(return != 0) BOOL CryptEncrypt(_In_ HCRYPTKEY hKey, _In_opt_ HC // Encrypted data will be longer. Reserve more space and retry. aData.resize(((dwBufLen = dwEncLen) + sizeof(_Ty) - 1) / sizeof(_Ty)); dwEncLen = dwDataLen; - if (CryptEncrypt(hKey, hHash, Final, dwFlags, (BYTE*)aData.data(), &dwEncLen, dwBufLen)) { + if (CryptEncrypt(hKey, hHash, Final, dwFlags, reinterpret_cast(aData.data()), &dwEncLen, dwBufLen)) { // Encryption succeeded. assert(dwEncLen <= dwBufLen); if (dwEncLen < dwBufLen) @@ -228,7 +228,7 @@ static _Success_(return != 0) BOOL CryptDecrypt(_In_ HCRYPTKEY hKey, _In_opt_ HC { DWORD dwDataLen = (DWORD)(aData.size() * sizeof(_Ty)); - if (CryptDecrypt(hKey, hHash, Final, dwFlags, (BYTE*)aData.data(), &dwDataLen)) { + if (CryptDecrypt(hKey, hHash, Final, dwFlags, reinterpret_cast(aData.data()), &dwDataLen)) { // Decryption succeeded. aData.resize((dwDataLen + sizeof(_Ty) - 1) / sizeof(_Ty)); return TRUE; diff --git a/include/WinStd/ETW.h b/include/WinStd/ETW.h index 4d659eef..a6d5c552 100644 --- a/include/WinStd/ETW.h +++ b/include/WinStd/ETW.h @@ -40,7 +40,7 @@ static _Success_(return == ERROR_SUCCESS) ULONG TdhGetProperty(_In_ PEVENT_RECOR if (ulSize) { // Query property value. aData.resize((ulSize + sizeof(_Ty) - 1) / sizeof(_Ty)); - ulResult = TdhGetProperty(pEvent, TdhContextCount, pTdhContext, PropertyDataCount, pPropertyData, ulSize, reinterpret_cast(aData.data())); + ulResult = TdhGetProperty(pEvent, TdhContextCount, pTdhContext, PropertyDataCount, pPropertyData, ulSize, reinterpret_cast(aData.data())); } else { // Property value size is zero. aData.clear(); diff --git a/include/WinStd/Win.h b/include/WinStd/Win.h index b0dfe5f1..7d2e21f9 100644 --- a/include/WinStd/Win.h +++ b/include/WinStd/Win.h @@ -550,7 +550,7 @@ static LSTATUS RegQueryValueExA(_In_ HKEY hKey, _In_opt_z_ LPCSTR lpValueName, _ } else if (lResult == ERROR_MORE_DATA) { // Allocate buffer on heap and retry. aData.resize((dwSize + sizeof(_Ty) - 1) / sizeof(_Ty)); - lResult = RegQueryValueExA(hKey, lpValueName, lpReserved, NULL, aData.data(), &dwSize); + lResult = RegQueryValueExA(hKey, lpValueName, lpReserved, NULL, reinterpret_cast(aData.data()), &dwSize); } return lResult; @@ -577,7 +577,7 @@ static LSTATUS RegQueryValueExW(_In_ HKEY hKey, _In_opt_z_ LPCWSTR lpValueName, } else if (lResult == ERROR_MORE_DATA) { // Allocate buffer on heap and retry. aData.resize((dwSize + sizeof(_Ty) - 1) / sizeof(_Ty)); - lResult = RegQueryValueExW(hKey, lpValueName, lpReserved, NULL, aData.data(), &dwSize); + lResult = RegQueryValueExW(hKey, lpValueName, lpReserved, NULL, reinterpret_cast(aData.data()), &dwSize); } return lResult;