[cpp-xmltooling] 02/02: Fix some time_t/int/long warnings.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-xmltooling.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=9f24659989be140e28fc1c47bb46534143af86d6

commit 9f24659989be140e28fc1c47bb46534143af86d6
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Mar 26 13:32:17 2018 -0400

    Fix some time_t/int/long warnings.
---
 xmltooling/util/PThreads.cpp          |  4 ++--
 xmltooling/util/ReloadableXMLFile.cpp |  2 +-
 xmltooling/util/ReloadableXMLFile.h   |  2 +-
 xmltooling/util/Threads.h             |  2 +-
 xmltooling/util/Win32Threads.cpp      | 18 +++++++++---------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/xmltooling/util/PThreads.cpp b/xmltooling/util/PThreads.cpp
index 172c638..9bc67e5 100644
--- a/xmltooling/util/PThreads.cpp
+++ b/xmltooling/util/PThreads.cpp
@@ -99,11 +99,11 @@ namespace xmltooling {
             return pthread_cond_wait(&cond, &(mutex->mutex));
         }
         
-        int timedwait(Mutex* mutex, int delay_seconds) {
+        int timedwait(Mutex* mutex, long delay_seconds) {
             return timedwait(static_cast<MutexImpl*>(mutex), delay_seconds);
         }
         
-        int timedwait(MutexImpl* mutex, int delay_seconds) {
+        int timedwait(MutexImpl* mutex, long delay_seconds) {
             struct timespec ts;
             memset(&ts, 0, sizeof(ts));
             ts.tv_sec = time(nullptr) + delay_seconds;
diff --git a/xmltooling/util/ReloadableXMLFile.cpp b/xmltooling/util/ReloadableXMLFile.cpp
index 6ffcf04..ea15d32 100644
--- a/xmltooling/util/ReloadableXMLFile.cpp
+++ b/xmltooling/util/ReloadableXMLFile.cpp
@@ -485,7 +485,7 @@ pair<bool,DOMElement*> ReloadableXMLFile::load(bool backup, string backingFile)
             remove(backingFile.c_str());
         throw;
     }
-    catch (long& ex) {
+    catch (long&) {
         if (!backingFile.empty() && !backup)
             remove(backingFile.c_str());
         throw;
diff --git a/xmltooling/util/ReloadableXMLFile.h b/xmltooling/util/ReloadableXMLFile.h
index bb1b50b..f2537ef 100644
--- a/xmltooling/util/ReloadableXMLFile.h
+++ b/xmltooling/util/ReloadableXMLFile.h
@@ -214,7 +214,7 @@ namespace xmltooling {
         time_t m_filestamp;
 
         /** Time in seconds to wait before trying for new copy of remote resource. */
-        time_t m_reloadInterval;
+        long m_reloadInterval;
 
         /** Caching tag associated with remote resource. */
         std::string m_cacheTag;
diff --git a/xmltooling/util/Threads.h b/xmltooling/util/Threads.h
index 191cb15..7e795b9 100644
--- a/xmltooling/util/Threads.h
+++ b/xmltooling/util/Threads.h
@@ -257,7 +257,7 @@ namespace xmltooling
          * @param delay_seconds maximum time to wait before waking up
          * @return 0 for success, non-zero for failure
          */
-        virtual int timedwait(Mutex* lock, int delay_seconds)=0;
+        virtual int timedwait(Mutex* lock, long delay_seconds)=0;
 
         /**
          * Signal a single thread to wake up if a condition changes.
diff --git a/xmltooling/util/Win32Threads.cpp b/xmltooling/util/Win32Threads.cpp
index bd244cb..c11d7d7 100644
--- a/xmltooling/util/Win32Threads.cpp
+++ b/xmltooling/util/Win32Threads.cpp
@@ -205,17 +205,17 @@ namespace xmltooling {
         }
 
         // wait for myself to signal and this mutex or the timeout
-        int timedwait(Mutex* mutex, int delay_seconds) {
-            int rc=mutex->unlock();
-            if(rc!=0)
+        int timedwait(Mutex* mutex, long delay_seconds) {
+            int rc = mutex->unlock();
+            if (rc != 0)
                 return rc;
 
-            int delay_ms=delay_seconds;
-            if(delay_seconds!=INFINITE)
-                delay_ms*=1000;
-            rc=WaitForSingleObject(cond,delay_ms);
-            int rc2=mutex->lock();
-            if(rc2!=0)
+            long delay_ms = delay_seconds;
+            if (delay_seconds != INFINITE)
+                delay_ms *= 1000;
+            rc = WaitForSingleObject(cond, delay_ms);
+            int rc2 = mutex->lock();
+            if(rc2 != 0)
                 return rc2;
             switch(rc) {
                 case WAIT_ABANDONED:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.