walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

ix compiler warning on Windows 64bit

This commit is contained in:
amai2012 2014-06-30 12:48:42 +02:00
parent f1762f9ed6
commit 6b5f34df4b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cli/cppcheckexecutor.cpp
View File

@ -434,7 +434,7 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * /*context*
static const ULONG maxnamelength = 512; static const ULONG maxnamelength = 512;
struct IMAGEHLP_SYMBOL64_EXT : public IMAGEHLP_SYMBOL64 { struct IMAGEHLP_SYMBOL64_EXT : public IMAGEHLP_SYMBOL64 {
TCHAR NameExt[maxnamelength]; TCHAR NameExt[maxnamelength]; // actually no need to worry about character encoding here
}; };
typedef BOOL (WINAPI *fpStackWalk64)(DWORD, HANDLE, HANDLE, LPSTACKFRAME64, PVOID, PREAD_PROCESS_MEMORY_ROUTINE64, PFUNCTION_TABLE_ACCESS_ROUTINE64, PGET_MODULE_BASE_ROUTINE64, PTRANSLATE_ADDRESS_ROUTINE64); typedef BOOL (WINAPI *fpStackWalk64)(DWORD, HANDLE, HANDLE, LPSTACKFRAME64, PVOID, PREAD_PROCESS_MEMORY_ROUTINE64, PFUNCTION_TABLE_ACCESS_ROUTINE64, PGET_MODULE_BASE_ROUTINE64, PTRANSLATE_ADDRESS_ROUTINE64);
static fpStackWalk64 pStackWalk64; static fpStackWalk64 pStackWalk64;
@ -497,9 +497,8 @@ static void PrintCallstack(FILE* f, PEXCEPTION_POINTERS ex)
stack.AddrFrame.Mode = AddrModeFlat; stack.AddrFrame.Mode = AddrModeFlat;
#endif #endif
IMAGEHLP_SYMBOL64_EXT symbol; IMAGEHLP_SYMBOL64_EXT symbol;
IMAGEHLP_SYMBOL64* pSymbol = &symbol; symbol.SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64);
pSymbol->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64); symbol.MaxNameLength = maxnamelength;
pSymbol->MaxNameLength = maxnamelength;
DWORD64 displacement = 0; DWORD64 displacement = 0;
int beyond_main=-1; // emergency exit, see below int beyond_main=-1; // emergency exit, see below
for (ULONG frame = 0; ; frame++) { for (ULONG frame = 0; ; frame++) {
@ -521,9 +520,9 @@ static void PrintCallstack(FILE* f, PEXCEPTION_POINTERS ex)
); );
if (!result) // official end... if (!result) // official end...
break; break;
result = pSymGetSymFromAddr64(hProcess, (ULONG64)stack.AddrPC.Offset, &displacement, pSymbol); result = pSymGetSymFromAddr64(hProcess, (ULONG64)stack.AddrPC.Offset, &displacement, &symbol);
TCHAR undname[maxnamelength]= {0}; TCHAR undname[maxnamelength]= {0};
pUnDecorateSymbolName((const TCHAR*)pSymbol->Name, (PTSTR)undname, GetArrayLength(undname), UNDNAME_COMPLETE); pUnDecorateSymbolName((const TCHAR*)symbol.Name, (PTSTR)undname, (DWORD)GetArrayLength(undname), UNDNAME_COMPLETE);
if (beyond_main>=0) if (beyond_main>=0)
++beyond_main; ++beyond_main;
if (_tcscmp(undname, _T("main"))==0) if (_tcscmp(undname, _T("main"))==0)