Change the fSecs field of plUnifiedTime from UInt32 to time_t.

This fixes various date formatting problems when building on a system where time_t is 64-bit (e.g. Visual Studio 2010), and, as a bonus, extends the range past 2038 on such systems.

The wire protocol is left at 32-bit for now, we might change that to 64 when other reasons to break compatibility have accumulated.

Sources/Plasma/PubUtilLib/plUnifiedTime/plTimeSpan.cpp

@@ -28,22 +28,22 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 long plTimeSpan::GetTotalDays() const
 {
-    return fSecs / (24*3600L);
+    return (long)(fSecs / (24*3600L));
 }
 
 long plTimeSpan::GetTotalHours() const
 {
-    return fSecs / 3600;
+    return (long)(fSecs / 3600);
 }
 
 long plTimeSpan::GetTotalMinutes() const
 {
-    return fSecs / 60;
+    return (long)(fSecs / 60);
 }
 
 long plTimeSpan::GetTotalSeconds() const
 {
-    return fSecs;
+    return (long)fSecs;
 }
 
 

Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp

@@ -59,7 +59,7 @@ hsBool plUnifiedTime::SetFromWinFileTime(const FILETIME ft)
 
     if (ffsecs >= MAGICWINDOWSOFFSET)  // make sure we won't end up negatice
     {
-        fSecs = (UInt32)(ffsecs-MAGICWINDOWSOFFSET);
+        fSecs = (time_t)(ffsecs-MAGICWINDOWSOFFSET);
         fMicros = (UInt32)(ff % 10000000)/10;
         return true;
     }
@@ -200,14 +200,14 @@ const plUnifiedTime & plUnifiedTime::operator=(const plUnifiedTime * src)
 
 const plUnifiedTime & plUnifiedTime::operator=(time_t src)
 {
-    fSecs = (UInt32)src;
+    fSecs = src;
     fMicros = 0;
     return *this;
 }
 
 const plUnifiedTime & plUnifiedTime::operator=(unsigned long src)
 {
-    fSecs = src;
+    fSecs = (time_t)src;
     fMicros = 0;
     return *this;
 }
@@ -222,7 +222,7 @@ const plUnifiedTime & plUnifiedTime::operator=(const struct timeval & src)
 const plUnifiedTime & plUnifiedTime::operator=(const struct tm & src)
 {
     struct tm atm = src;
-    fSecs = (UInt32)mktime(&atm);   // this won't work after 2030 something, sorry
+    fSecs = mktime(&atm);
     return *this;
 }
 
@@ -231,16 +231,10 @@ void plUnifiedTime::SetSecsDouble(double secs)
     hsAssert(secs>=0, "plUnifiedTime::SetSecsDouble negative time");
     double x,y;
     x = modf(secs,&y);
-    fSecs = (UInt32)y;
+    fSecs = (time_t)y;
     fMicros = (UInt32)(x*1000000);
 }
 
-void plUnifiedTime::FromMillis(UInt32 millis)
-{
-    fSecs = millis/1000;
-    fMicros = 0;
-}
-
 
 void plUnifiedTime::ToCurrentTime()
 {
@@ -268,7 +262,7 @@ hsBool plUnifiedTime::SetTime(short year, short month, short day, short hour, sh
     atm.tm_mon = month - 1;
     atm.tm_year = year - 1900;
     atm.tm_isdst = dst;
-    fSecs = (UInt32)mktime(&atm);   // this won't work after 2030 something, sorry
+    fSecs = mktime(&atm);
     if (fSecs == -1)
         return false;
     if (fMicros >= 1000000)
@@ -280,7 +274,7 @@ hsBool plUnifiedTime::SetTime(short year, short month, short day, short hour, sh
 
 hsBool plUnifiedTime::GetTime(short &year, short &month, short &day, short &hour, short &minute, short &second) const
 {
-    struct tm* time = IGetTime((const time_t *)&fSecs);
+    struct tm* time = IGetTime(&fSecs);
     if (!time)
         return false;
     year = time->tm_year+1900;
@@ -308,8 +302,8 @@ const char* plUnifiedTime::Print() const
 const char* plUnifiedTime::PrintWMillis() const
 {
     static std::string s;
-    xtl::format(s,"%s,s:%d,ms:%d",
-        Print(), GetSecs(), GetMillis() );
+    xtl::format(s,"%s,s:%lu,ms:%d",
+        Print(), (unsigned long)GetSecs(), GetMillis() );
     return s.c_str();
 }
 
@@ -317,11 +311,11 @@ struct tm * plUnifiedTime::GetTm(struct tm * ptm) const
 {
     if (ptm != nil)
     {
-        *ptm = *IGetTime((const time_t *)&fSecs);
+        *ptm = *IGetTime(&fSecs);
         return ptm;
     }
     else
-        return IGetTime((const time_t *)&fSecs);
+        return IGetTime(&fSecs);
 }
 
 int plUnifiedTime::GetYear() const
@@ -367,15 +361,12 @@ double plUnifiedTime::GetSecsDouble() const
 }
 #pragma optimize( "", on )  // restore optimizations to their defaults
 
-UInt32 plUnifiedTime::AsMillis()
-{
-    return GetSecs()*1000;
-}
-
 void plUnifiedTime::Read(hsStream* s)
 {
     s->LogSubStreamStart("UnifiedTime");
-    s->LogReadSwap(&fSecs,"Seconds");
+    UInt32 secs;
+    s->LogReadSwap(&secs,"Seconds");
+    fSecs = (time_t)secs;
     s->LogReadSwap(&fMicros,"MicroSeconds");
     s->LogSubStreamEnd();
     // preserve fMode
@@ -383,7 +374,7 @@ void plUnifiedTime::Read(hsStream* s)
 
 void plUnifiedTime::Write(hsStream* s) const
 {
-    s->WriteSwap(fSecs);
+    s->WriteSwap((UInt32)fSecs);
     s->WriteSwap(fMicros);
     // preserve fMode
 }
@@ -442,7 +433,12 @@ bool plUnifiedTime::operator>=(const plUnifiedTime & rhs) const
 
 plUnifiedTime::operator timeval() const
 {
+#if HS_BUILD_FOR_WIN32
+    // tv_secs should be a time_t, but on Windows it is a long
+    struct timeval t = {(long)fSecs, (long)fMicros};
+#else
     struct timeval t = {fSecs, fMicros};
+#endif
     return t;
 }
 
@@ -456,7 +452,7 @@ plUnifiedTime::operator struct tm() const
 std::string plUnifiedTime::Format(const char * fmt) const
 {
     char buf[128];
-    struct tm * t = IGetTime((const time_t *)&fSecs);
+    struct tm * t = IGetTime(&fSecs);
     if (t == nil ||
         !strftime(buf, sizeof(buf), fmt, t))
         buf[0] = '\0';

Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.h

@@ -59,7 +59,7 @@ public:
     };
 
 protected:
-    UInt32  fSecs;
+    time_t  fSecs;
     UInt32  fMicros;
     Mode    fMode;
 
@@ -92,7 +92,7 @@ public:
     const plUnifiedTime & operator=(const struct tm & src);
 
     // getters
-    UInt32 GetSecs() const { return fSecs; }
+    time_t GetSecs() const { return fSecs; }
     UInt32 GetMicros() const { return fMicros; }
     double GetSecsDouble() const;  // get the secs and micros as a double floating point value
     hsBool GetTime(short &year, short &month, short &day, short &hour, short &minute, short &second) const;
@@ -106,10 +106,9 @@ public:
     int GetMillis() const;
     int GetDayOfWeek() const;
     int GetMode() const {return fMode;} // local or gmt.
-    UInt32 AsMillis();
 
     // setters
-    void SetSecs(const UInt32 secs) { fSecs = secs; }
+    void SetSecs(const time_t secs) { fSecs = secs; }
     void SetSecsDouble(double secs);
     void SetMicros(const UInt32 micros) { fMicros = micros; }
     hsBool SetTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec=0, int dst=-1);
@@ -118,7 +117,6 @@ public:
     void ToCurrentTime();
     void ToEpoch() { fSecs = 0; fMicros = 0;}
     void SetMode(Mode mode) { fMode=mode;}
-    void FromMillis(UInt32 millis);
 #if HS_BUILD_FOR_WIN32
     hsBool SetFromWinFileTime(const FILETIME ft);
 #endif