AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid harmless warning about shadowing a parameter

Browse Source 
Rename GetSysErrorMsg() buffer size parameter introduced in the recent commit
343318d73e to avoid clash with the local
variable of the same name.

See https://github.com/wxWidgets/wxWidgets/pull/343
This commit is contained in:
Vadim Zeitlin 2016-11-30 17:59:27 +01:00
parent d639e4ffce
commit aad8663698
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/log.cpp
View File

@ -1057,7 +1057,7 @@ unsigned long wxSysErrorCode()
#endif //Win/Unix
}
static const wxChar* GetSysErrorMsg(wxChar* szBuf, size_t len, unsigned long nErrCode)
static const wxChar* GetSysErrorMsg(wxChar* szBuf, size_t sizeBuf, unsigned long nErrCode)
{
if ( nErrCode == 0 )
nErrCode = wxSysErrorCode();
@ -1087,7 +1087,7 @@ static const wxChar* GetSysErrorMsg(wxChar* szBuf, size_t len, unsigned long nEr
// Crashes on SmartPhone (FIXME)
if( lpMsgBuf != 0 )
{
wxStrlcpy(szBuf, (const wxChar *)lpMsgBuf, len);
wxStrlcpy(szBuf, (const wxChar *)lpMsgBuf, sizeBuf);
LocalFree(lpMsgBuf);
@ -1121,10 +1121,10 @@ static const wxChar* GetSysErrorMsg(wxChar* szBuf, size_t len, unsigned long nEr
// at this point errorMsg might not point to buffer anymore
szBuf[0] = wxS('\0');
#if wxUSE_UNICODE
wxConvCurrent->MB2WC(szBuf, errorMsg, len - 1);
szBuf[len - 1] = wxS('\0');
wxConvCurrent->MB2WC(szBuf, errorMsg, sizeBuf - 1);
szBuf[sizeBuf - 1] = wxS('\0');
#else
wxStrlcpy(szBuf, errorMsg, len);
wxStrlcpy(szBuf, errorMsg, sizeBuf);
#endif
return szBuf;
#endif // __WINDOWS__/!__WINDOWS__