diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmTimestamp.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-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/cmTimestamp.cxx')
-rw-r--r-- | Source/cmTimestamp.cxx | 98 |
1 files changed, 43 insertions, 55 deletions
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 90bc4de..c624d0f 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -19,84 +19,74 @@ // include sys/stat.h after sys/types.h #include <sys/stat.h> -std::string cmTimestamp::CurrentTime( - const std::string& formatString, bool utcFlag) +std::string cmTimestamp::CurrentTime(const std::string& formatString, + bool utcFlag) { time_t currentTimeT = time(0); - if(currentTimeT == time_t(-1)) - { + if (currentTimeT == time_t(-1)) { return std::string(); - } + } return CreateTimestampFromTimeT(currentTimeT, formatString, utcFlag); } std::string cmTimestamp::FileModificationTime(const char* path, - const std::string& formatString, bool utcFlag) + const std::string& formatString, + bool utcFlag) { - if(!cmsys::SystemTools::FileExists(path)) - { + if (!cmsys::SystemTools::FileExists(path)) { return std::string(); - } + } time_t mtime = cmsys::SystemTools::ModifiedTime(path); return CreateTimestampFromTimeT(mtime, formatString, utcFlag); } std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, - std::string formatString, bool utcFlag) const + std::string formatString, + bool utcFlag) const { - if(formatString.empty()) - { + if (formatString.empty()) { formatString = "%Y-%m-%dT%H:%M:%S"; - if(utcFlag) - { + if (utcFlag) { formatString += "Z"; - } } + } struct tm timeStruct; memset(&timeStruct, 0, sizeof(timeStruct)); - struct tm* ptr = (struct tm*) 0; - if(utcFlag) - { + struct tm* ptr = (struct tm*)0; + if (utcFlag) { ptr = gmtime(&timeT); - } - else - { + } else { ptr = localtime(&timeT); - } + } - if(ptr == 0) - { + if (ptr == 0) { return std::string(); - } + } timeStruct = *ptr; std::string result; - for(std::string::size_type i = 0; i < formatString.size(); ++i) - { + for (std::string::size_type i = 0; i < formatString.size(); ++i) { char c1 = formatString[i]; - char c2 = (i + 1 < formatString.size()) ? - formatString[i + 1] : static_cast<char>(0); + char c2 = (i + 1 < formatString.size()) ? formatString[i + 1] + : static_cast<char>(0); - if(c1 == '%' && c2 != 0) - { + if (c1 == '%' && c2 != 0) { result += AddTimestampComponent(c2, timeStruct, timeT); ++i; - } - else - { + } else { result += c1; - } } + } return result; } -time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const +time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm& tm) const { #if defined(_MSC_VER) && _MSC_VER >= 1400 return _mkgmtime(&tm); @@ -104,10 +94,9 @@ time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const // From Linux timegm() manpage. std::string tz_old = "TZ="; - if (const char* tz = cmSystemTools::GetEnv("TZ")) - { + if (const char* tz = cmSystemTools::GetEnv("TZ")) { tz_old += tz; - } + } // The standard says that "TZ=" or "TZ=[UNRECOGNIZED_TZ]" means UTC. // It seems that "TZ=" does NOT work, at least under Windows @@ -127,14 +116,14 @@ time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const #endif } -std::string cmTimestamp::AddTimestampComponent( - char flag, struct tm& timeStruct, const time_t timeT) const +std::string cmTimestamp::AddTimestampComponent(char flag, + struct tm& timeStruct, + const time_t timeT) const { std::string formatString = "%"; formatString += flag; - switch(flag) - { + switch (flag) { case 'd': case 'H': case 'I': @@ -148,35 +137,34 @@ std::string cmTimestamp::AddTimestampComponent( case 'Y': break; case 's': // Seconds since UNIX epoch (midnight 1-jan-1970) - { + { // Build a time_t for UNIX epoch and substract from the input "timeT": struct tm tmUnixEpoch; memset(&tmUnixEpoch, 0, sizeof(tmUnixEpoch)); tmUnixEpoch.tm_mday = 1; - tmUnixEpoch.tm_year = 1970-1900; + tmUnixEpoch.tm_year = 1970 - 1900; const time_t unixEpoch = this->CreateUtcTimeTFromTm(tmUnixEpoch); - if (unixEpoch == -1) - { - cmSystemTools::Error("Error generating UNIX epoch in " + if (unixEpoch == -1) { + cmSystemTools::Error( + "Error generating UNIX epoch in " "STRING(TIMESTAMP ...). Please, file a bug report aginst CMake"); return std::string(); - } + } std::stringstream ss; ss << static_cast<long int>(difftime(timeT, unixEpoch)); return ss.str(); - } - default: - { + } + default: { return formatString; - } } + } char buffer[16]; - size_t size = strftime(buffer, sizeof(buffer), - formatString.c_str(), &timeStruct); + size_t size = + strftime(buffer, sizeof(buffer), formatString.c_str(), &timeStruct); return std::string(buffer, size); } |