diff options
| author | 2014-12-03 12:57:57 -0600 | |
|---|---|---|
| committer | 2014-12-03 12:57:57 -0600 | |
| commit | 8a624239703c046d89ebeaf3ea13c87af75b550f (patch) | |
| tree | 19546d2b06c71add6140f322a8aab0c918bbd9ca /src/common/extended_trace.cpp | |
| parent | Merge pull request #236 from rohit-n/sign-compare (diff) | |
| download | yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.gz yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.xz yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.zip | |
Change NULLs to nullptrs.
Diffstat (limited to '')
| -rw-r--r-- | src/common/extended_trace.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/common/extended_trace.cpp b/src/common/extended_trace.cpp index bf61ac1d1..cf7c346d4 100644 --- a/src/common/extended_trace.cpp +++ b/src/common/extended_trace.cpp | |||
| @@ -82,7 +82,7 @@ static void InitSymbolPath( PSTR lpszSymbolPath, PCSTR lpszIniPath ) | |||
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | // Add user defined path | 84 | // Add user defined path |
| 85 | if ( lpszIniPath != NULL ) | 85 | if ( lpszIniPath != nullptr ) |
| 86 | if ( lpszIniPath[0] != '\0' ) | 86 | if ( lpszIniPath[0] != '\0' ) |
| 87 | { | 87 | { |
| 88 | strcat( lpszSymbolPath, ";" ); | 88 | strcat( lpszSymbolPath, ";" ); |
| @@ -138,7 +138,7 @@ static BOOL GetFunctionInfoFromAddresses( ULONG fnAddress, ULONG stackAddress, L | |||
| 138 | DWORD dwSymSize = 10000; | 138 | DWORD dwSymSize = 10000; |
| 139 | TCHAR lpszUnDSymbol[BUFFERSIZE]=_T("?"); | 139 | TCHAR lpszUnDSymbol[BUFFERSIZE]=_T("?"); |
| 140 | CHAR lpszNonUnicodeUnDSymbol[BUFFERSIZE]="?"; | 140 | CHAR lpszNonUnicodeUnDSymbol[BUFFERSIZE]="?"; |
| 141 | LPTSTR lpszParamSep = NULL; | 141 | LPTSTR lpszParamSep = nullptr; |
| 142 | LPTSTR lpszParsed = lpszUnDSymbol; | 142 | LPTSTR lpszParsed = lpszUnDSymbol; |
| 143 | PIMAGEHLP_SYMBOL pSym = (PIMAGEHLP_SYMBOL)GlobalAlloc( GMEM_FIXED, dwSymSize ); | 143 | PIMAGEHLP_SYMBOL pSym = (PIMAGEHLP_SYMBOL)GlobalAlloc( GMEM_FIXED, dwSymSize ); |
| 144 | 144 | ||
| @@ -187,13 +187,13 @@ static BOOL GetFunctionInfoFromAddresses( ULONG fnAddress, ULONG stackAddress, L | |||
| 187 | 187 | ||
| 188 | // Let's go through the stack, and modify the function prototype, and insert the actual | 188 | // Let's go through the stack, and modify the function prototype, and insert the actual |
| 189 | // parameter values from the stack | 189 | // parameter values from the stack |
| 190 | if ( _tcsstr( lpszUnDSymbol, _T("(void)") ) == NULL && _tcsstr( lpszUnDSymbol, _T("()") ) == NULL) | 190 | if ( _tcsstr( lpszUnDSymbol, _T("(void)") ) == nullptr && _tcsstr( lpszUnDSymbol, _T("()") ) == nullptr) |
| 191 | { | 191 | { |
| 192 | ULONG index = 0; | 192 | ULONG index = 0; |
| 193 | for( ; ; index++ ) | 193 | for( ; ; index++ ) |
| 194 | { | 194 | { |
| 195 | lpszParamSep = _tcschr( lpszParsed, _T(',') ); | 195 | lpszParamSep = _tcschr( lpszParsed, _T(',') ); |
| 196 | if ( lpszParamSep == NULL ) | 196 | if ( lpszParamSep == nullptr ) |
| 197 | break; | 197 | break; |
| 198 | 198 | ||
| 199 | *lpszParamSep = _T('\0'); | 199 | *lpszParamSep = _T('\0'); |
| @@ -205,7 +205,7 @@ static BOOL GetFunctionInfoFromAddresses( ULONG fnAddress, ULONG stackAddress, L | |||
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | lpszParamSep = _tcschr( lpszParsed, _T(')') ); | 207 | lpszParamSep = _tcschr( lpszParsed, _T(')') ); |
| 208 | if ( lpszParamSep != NULL ) | 208 | if ( lpszParamSep != nullptr ) |
| 209 | { | 209 | { |
| 210 | *lpszParamSep = _T('\0'); | 210 | *lpszParamSep = _T('\0'); |
| 211 | 211 | ||
| @@ -248,7 +248,7 @@ static BOOL GetSourceInfoFromAddress( UINT address, LPTSTR lpszSourceInfo ) | |||
| 248 | PCSTR2LPTSTR( lineInfo.FileName, lpszFileName ); | 248 | PCSTR2LPTSTR( lineInfo.FileName, lpszFileName ); |
| 249 | TCHAR fname[_MAX_FNAME]; | 249 | TCHAR fname[_MAX_FNAME]; |
| 250 | TCHAR ext[_MAX_EXT]; | 250 | TCHAR ext[_MAX_EXT]; |
| 251 | _tsplitpath(lpszFileName, NULL, NULL, fname, ext); | 251 | _tsplitpath(lpszFileName, nullptr, nullptr, fname, ext); |
| 252 | _stprintf( lpszSourceInfo, _T("%s%s(%d)"), fname, ext, lineInfo.LineNumber ); | 252 | _stprintf( lpszSourceInfo, _T("%s%s(%d)"), fname, ext, lineInfo.LineNumber ); |
| 253 | ret = TRUE; | 253 | ret = TRUE; |
| 254 | } | 254 | } |
| @@ -332,11 +332,11 @@ void StackTrace( HANDLE hThread, const char* lpszMessage, FILE *file ) | |||
| 332 | hProcess, | 332 | hProcess, |
| 333 | hThread, | 333 | hThread, |
| 334 | &callStack, | 334 | &callStack, |
| 335 | NULL, | 335 | nullptr, |
| 336 | NULL, | 336 | nullptr, |
| 337 | SymFunctionTableAccess, | 337 | SymFunctionTableAccess, |
| 338 | SymGetModuleBase, | 338 | SymGetModuleBase, |
| 339 | NULL); | 339 | nullptr); |
| 340 | 340 | ||
| 341 | if ( index == 0 ) | 341 | if ( index == 0 ) |
| 342 | continue; | 342 | continue; |
| @@ -389,11 +389,11 @@ void StackTrace(HANDLE hThread, const char* lpszMessage, FILE *file, DWORD eip, | |||
| 389 | hProcess, | 389 | hProcess, |
| 390 | hThread, | 390 | hThread, |
| 391 | &callStack, | 391 | &callStack, |
| 392 | NULL, | 392 | nullptr, |
| 393 | NULL, | 393 | nullptr, |
| 394 | SymFunctionTableAccess, | 394 | SymFunctionTableAccess, |
| 395 | SymGetModuleBase, | 395 | SymGetModuleBase, |
| 396 | NULL); | 396 | nullptr); |
| 397 | 397 | ||
| 398 | if ( index == 0 ) | 398 | if ( index == 0 ) |
| 399 | continue; | 399 | continue; |