diff options
author | Ruslan Baratov <ruslan_baratov@yahoo.com> | 2014-12-05 14:18:11 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-12-05 17:59:37 (GMT) |
commit | 97841dad2ba5a79acb0b22db9a01ae45f7b2e80b (patch) | |
tree | a549030bf27c8d94e42fbbd35e723ff56206c07b /Source/cmFileLockPool.cxx | |
parent | 356f7cf4457271ee85a71face453ea9579f05da3 (diff) | |
download | CMake-97841dad2ba5a79acb0b22db9a01ae45f7b2e80b.zip CMake-97841dad2ba5a79acb0b22db9a01ae45f7b2e80b.tar.gz CMake-97841dad2ba5a79acb0b22db9a01ae45f7b2e80b.tar.bz2 |
file: Use 'long' to represent the parsed LOCK TIMEOUT value
Convert the StringToInt helper into a StringToLong helper with a 'long'
result type. This will make the helper more useful to other callers
that want to use strtol.
While at it, also check errno after calling strtol in case the
conversion fails with a range error.
Diffstat (limited to 'Source/cmFileLockPool.cxx')
-rw-r--r-- | Source/cmFileLockPool.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmFileLockPool.cxx b/Source/cmFileLockPool.cxx index e84e71a..551a75a 100644 --- a/Source/cmFileLockPool.cxx +++ b/Source/cmFileLockPool.cxx @@ -60,7 +60,7 @@ void cmFileLockPool::PopFileScope() } cmFileLockResult cmFileLockPool::LockFunctionScope( - const std::string& filename, unsigned timeoutSec) + const std::string& filename, unsigned long timeoutSec) { if (this->IsAlreadyLocked(filename)) { @@ -74,7 +74,7 @@ cmFileLockResult cmFileLockPool::LockFunctionScope( } cmFileLockResult cmFileLockPool::LockFileScope( - const std::string& filename, unsigned timeoutSec) + const std::string& filename, unsigned long timeoutSec) { if (this->IsAlreadyLocked(filename)) { @@ -85,7 +85,7 @@ cmFileLockResult cmFileLockPool::LockFileScope( } cmFileLockResult cmFileLockPool::LockProcessScope( - const std::string& filename, unsigned timeoutSec) + const std::string& filename, unsigned long timeoutSec) { if (this->IsAlreadyLocked(filename)) { @@ -155,7 +155,7 @@ cmFileLockPool::ScopePool::~ScopePool() } cmFileLockResult cmFileLockPool::ScopePool::Lock( - const std::string& filename, unsigned timeoutSec) + const std::string& filename, unsigned long timeoutSec) { cmFileLock *lock = new cmFileLock(); const cmFileLockResult result = lock->Lock(filename, timeoutSec); |