diff options
| -rw-r--r-- | gm/cubicpaths.cpp | 1 | ||||
| -rw-r--r-- | include/core/SkRect.h | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLExtensions.cpp | 2 | ||||
| -rw-r--r-- | tools/win_dbghelp.cpp | 23 |
4 files changed, 13 insertions, 15 deletions
diff --git a/gm/cubicpaths.cpp b/gm/cubicpaths.cpp index 88f7ab15c5..9ab710a7ae 100644 --- a/gm/cubicpaths.cpp +++ b/gm/cubicpaths.cpp @@ -300,4 +300,3 @@ private: DEF_GM( return new CubicPathGM; ) DEF_GM( return new CubicClosePathGM; ) - diff --git a/include/core/SkRect.h b/include/core/SkRect.h index ae0ac4f9e8..b2f515129d 100644 --- a/include/core/SkRect.h +++ b/include/core/SkRect.h @@ -769,7 +769,7 @@ struct SK_API SkRect { * other. When this returns, left <= right && top <= bottom */ void sort(); - + /** * cast-safe way to treat the rect as an array of (4) SkScalars. */ diff --git a/src/gpu/gl/GrGLExtensions.cpp b/src/gpu/gl/GrGLExtensions.cpp index 32bf963186..47cdba14b8 100644 --- a/src/gpu/gl/GrGLExtensions.cpp +++ b/src/gpu/gl/GrGLExtensions.cpp @@ -48,7 +48,7 @@ bool GrGLExtensions::init(GrGLBinding binding, } } else { const char* extensions = (const char*) getString(GR_GL_EXTENSIONS); - if (NULL == extensions) { + if (NULL == extensions) { return false; } while (true) { diff --git a/tools/win_dbghelp.cpp b/tools/win_dbghelp.cpp index 4102399a4f..eefb8ac1ce 100644 --- a/tools/win_dbghelp.cpp +++ b/tools/win_dbghelp.cpp @@ -50,7 +50,7 @@ static void strncpyOrSetBlank(char* dest, const char* src, size_t len) { } char debug_app_name[MAX_PATH] = ""; -void setAppName(const char* app_name) { +void setAppName(const char* app_name) { strncpyOrSetBlank(debug_app_name, app_name, sizeof(debug_app_name)); } @@ -118,16 +118,16 @@ static void printCallstack(const char* filename, szPath, szAppName, szVersion, \ stLocalTime.wYear, stLocalTime.wMonth, stLocalTime.wDay, \ stLocalTime.wHour, stLocalTime.wMinute, stLocalTime.wSecond, \ - GetCurrentProcessId(), GetCurrentThreadId()); + GetCurrentProcessId(), GetCurrentThreadId()); // Exception execution handler. Exception is recognized. Transfer control to // the exception handler by executing the __except compound statement, // then continue execution after the __except block. int GenerateDumpAndPrintCallstack(EXCEPTION_POINTERS* pExceptionPointers) { BOOL bMiniDumpSuccessful; - char szPath[MAX_PATH]; - char szFileName[MAX_PATH]; - char szFileNameOutput[MAX_PATH]; + char szPath[MAX_PATH]; + char szFileName[MAX_PATH]; + char szFileNameOutput[MAX_PATH]; const char* szAppName = getAppName(); const char* szVersion = getAppVersion(); DWORD dwBufferSize = MAX_PATH; @@ -145,7 +145,7 @@ int GenerateDumpAndPrintCallstack(EXCEPTION_POINTERS* pExceptionPointers) { BUILD_UNIQUE_FILENAME(szFileNameOutput, ".out", szPath, szAppName, szVersion, stLocalTime); hDumpFile = CreateFile(szFileName, - GENERIC_READ|GENERIC_WRITE, + GENERIC_READ|GENERIC_WRITE, FILE_SHARE_WRITE|FILE_SHARE_READ, 0, CREATE_ALWAYS, @@ -157,7 +157,7 @@ int GenerateDumpAndPrintCallstack(EXCEPTION_POINTERS* pExceptionPointers) { ExpParam.ClientPointers = TRUE; bMiniDumpSuccessful = MiniDumpWriteDump(GetCurrentProcess(), - GetCurrentProcessId(), + GetCurrentProcessId(), hDumpFile, MiniDumpWithDataSegs, &ExpParam, @@ -170,7 +170,7 @@ int GenerateDumpAndPrintCallstack(EXCEPTION_POINTERS* pExceptionPointers) { const char* cdbExePath = getCdbPath(); if (cdbExePath && *cdbExePath != '\0') { printf("Cdb exe: %s\n", cdbExePath); - + char command[MAX_PATH * 4]; sprintf(command, "%s -y \"%s\" -i \"%s\" -z \"%s\" -c \"%s\" -kqm >\"%s\"", cdbExePath, @@ -182,16 +182,16 @@ int GenerateDumpAndPrintCallstack(EXCEPTION_POINTERS* pExceptionPointers) { system(command); printf("\nThread Callstack:\n"); - printCallstack(szFileNameOutput, + printCallstack(szFileNameOutput, MARKER_THREAD_CALLSTACK_START, MARKER_THREAD_CALLSTACK_STOP); - printf("\nException Callstack:\n"); + printf("\nException Callstack:\n"); printCallstack(szFileNameOutput, MARKER_EXCEPTION_CALLSTACK_START, MARKER_EXCEPTION_CALLSTACK_STOP); } else { - printf("Warning: CDB path not set up.\n"); + printf("Warning: CDB path not set up.\n"); } return EXCEPTION_EXECUTE_HANDLER; @@ -241,4 +241,3 @@ void setUpDebuggingFromArgs(const char* vargs0) { #endif setCdbPath(cdbExePath); } - |