From b5c020c73250b97ff65cc1d2ee109520daea9f3e Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 29 Jun 2020 14:04:57 +0200 Subject: [PATCH] Resolve code analysis reported warnings Signed-off-by: Simon Rozman --- include/WinStd/Win.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/WinStd/Win.h b/include/WinStd/Win.h index 78e1c4b6..90b8c19e 100644 --- a/include/WinStd/Win.h +++ b/include/WinStd/Win.h @@ -1151,13 +1151,13 @@ inline DWORD GetModuleFileNameA(_In_opt_ HMODULE hModule, _Out_ std::basic_strin { assert(0); // TODO: Test this code. - _Elem szBuffer[WINSTD_STACK_BUFFER_BYTES/sizeof(_Elem)]; + _Elem szStackBuffer[WINSTD_STACK_BUFFER_BYTES/sizeof(_Elem)]; // Try with stack buffer first. - DWORD dwResult = ::GetModuleFileNameA(hModule, szBuffer, _countof(szBuffer)); - if (dwResult < _countof(szBuffer)) { + DWORD dwResult = ::GetModuleFileNameA(hModule, szStackBuffer, _countof(szStackBuffer)); + if (dwResult < _countof(szStackBuffer)) { // Copy from stack. - sValue.assign(szBuffer, dwResult); + sValue.assign(szStackBuffer, dwResult); return dwResult; } else { for (DWORD dwCapacity = 2*WINSTD_STACK_BUFFER_BYTES/sizeof(_Elem);; dwCapacity *= 2) { @@ -1176,13 +1176,13 @@ inline DWORD GetModuleFileNameA(_In_opt_ HMODULE hModule, _Out_ std::basic_strin template inline DWORD GetModuleFileNameW(_In_opt_ HMODULE hModule, _Out_ std::basic_string<_Elem, _Traits, _Ax> &sValue) noexcept { - _Elem szBuffer[WINSTD_STACK_BUFFER_BYTES/sizeof(_Elem)]; + _Elem szStackBuffer[WINSTD_STACK_BUFFER_BYTES/sizeof(_Elem)]; // Try with stack buffer first. - DWORD dwResult = ::GetModuleFileNameW(hModule, szBuffer, _countof(szBuffer)); - if (dwResult < _countof(szBuffer)) { + DWORD dwResult = ::GetModuleFileNameW(hModule, szStackBuffer, _countof(szStackBuffer)); + if (dwResult < _countof(szStackBuffer)) { // Copy from stack. - sValue.assign(szBuffer, dwResult); + sValue.assign(szStackBuffer, dwResult); return dwResult; } else { for (DWORD dwCapacity = 2*WINSTD_STACK_BUFFER_BYTES/sizeof(_Elem);; dwCapacity *= 2) {