diff options
Diffstat (limited to 'Source/cmFileLockResult.cxx')
| -rw-r--r-- | Source/cmFileLockResult.cxx | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/Source/cmFileLockResult.cxx b/Source/cmFileLockResult.cxx index 045e7ee3cd..090fe60f2e 100644 --- a/Source/cmFileLockResult.cxx +++ b/Source/cmFileLockResult.cxx @@ -56,40 +56,29 @@ bool cmFileLockResult::IsOk() const std::string cmFileLockResult::GetOutputMessage() const { - switch (this->Type) - { + switch (this->Type) { case OK: return "0"; case SYSTEM: #if defined(_WIN32) - { + { char* errorText = NULL; // http://stackoverflow.com/a/455533/2288008 DWORD flags = FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_IGNORE_INSERTS; - ::FormatMessageA( - flags, - NULL, - this->ErrorValue, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPSTR)&errorText, - 0, - NULL - ); + FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS; + ::FormatMessageA(flags, NULL, this->ErrorValue, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPSTR)&errorText, 0, NULL); - if (errorText != NULL) - { + if (errorText != NULL) { const std::string message = errorText; ::LocalFree(errorText); return message; - } - else - { + } else { return "Internal error (FormatMessageA failed)"; - } } + } #else return strerror(this->ErrorValue); #endif @@ -102,10 +91,11 @@ std::string cmFileLockResult::GetOutputMessage() const case INTERNAL: default: return "Internal error"; - } + } } -cmFileLockResult::cmFileLockResult(ErrorType typeValue, Error errorValue): - Type(typeValue), ErrorValue(errorValue) +cmFileLockResult::cmFileLockResult(ErrorType typeValue, Error errorValue) + : Type(typeValue) + , ErrorValue(errorValue) { } |