summaryrefslogtreecommitdiffstats
path: root/Source/cmFileLockResult.cxx
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 14:34:04 (GMT)
committerBrad King <brad.king@kitware.com>2016-05-16 20:05:19 (GMT)
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Source/cmFileLockResult.cxx
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadCMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip
CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz
CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
Diffstat (limited to 'Source/cmFileLockResult.cxx')
-rw-r--r--Source/cmFileLockResult.cxx36
1 files changed, 13 insertions, 23 deletions
diff --git a/Source/cmFileLockResult.cxx b/Source/cmFileLockResult.cxx
index 045e7ee..090fe60 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)
{
}