dasher r3647 - in trunk: . Src/DasherCore

[pwelche svn gnome org]

Author: pwelche
Date: Tue Mar  3 19:06:01 2009
New Revision: 3647
URL: http://svn.gnome.org/viewvc/dasher?rev=3647&view=rev

Log:
Consider

struct timeval {
        long    tv_sec;         /* seconds */
        long    tv_usec;        /* and microseconds */
};

and wish that "long" were time_t. If clock_gettime existed
everywhere, that would be a good replacement for gettimeofday
as struct timespec always used time_t. Visual studio doesn't
have clock_gettime, so we need the #ifdefs anyway...


Modified:
   trunk/ChangeLog
   trunk/Src/DasherCore/BasicLog.cpp
   trunk/Src/DasherCore/FileLogger.cpp
   trunk/Src/DasherCore/TimeSpan.cpp
   trunk/Src/DasherCore/UserLog.cpp

Modified: trunk/Src/DasherCore/BasicLog.cpp
==============================================================================
--- trunk/Src/DasherCore/BasicLog.cpp	(original)
+++ trunk/Src/DasherCore/BasicLog.cpp	Tue Mar  3 19:06:01 2009
@@ -72,23 +72,11 @@
 }
 
 std::string CBasicLog::GetDateStamp() {
-  std::string strDateStamp = "";
-
-#ifdef _WIN32
-  struct timeb sTimeBuffer;
-#else
-  struct timeval sTimeBuffer;
-  struct timezone sTimezoneBuffer;
-#endif
   char* szTimeLine = NULL;
+  time_t t;
 
-#ifdef _WIN32
-    ftime(&sTimeBuffer);
-    szTimeLine = ctime(&(sTimeBuffer.time));
-#else
-    gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
-    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
-#endif
+  t = time(NULL);
+  szTimeLine = ctime(&t);
 
-    return std::string(szTimeLine).substr(0, 24);
+  return std::string(szTimeLine).substr(0, 24);
 }

Modified: trunk/Src/DasherCore/FileLogger.cpp
==============================================================================
--- trunk/Src/DasherCore/FileLogger.cpp	(original)
+++ trunk/Src/DasherCore/FileLogger.cpp	Tue Mar  3 19:06:01 2009
@@ -504,6 +504,7 @@
 #else
     struct timeval sTimeBuffer;
     struct timezone sTimezoneBuffer;
+    time_t t;
 #endif
     char* szTimeLine = NULL;
 
@@ -512,7 +513,8 @@
     szTimeLine = ctime(&(sTimeBuffer.time));
 #else
     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
-    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+    t = sTimeBuffer.tv_sec;
+    szTimeLine = ctime(&t);
 #endif
  
     // Format is:

Modified: trunk/Src/DasherCore/TimeSpan.cpp
==============================================================================
--- trunk/Src/DasherCore/TimeSpan.cpp	(original)
+++ trunk/Src/DasherCore/TimeSpan.cpp	Tue Mar  3 19:06:01 2009
@@ -115,6 +115,7 @@
 #else
     struct timeval sTimeBuffer;
     struct timezone sTimezoneBuffer;
+    time_t t;
 #endif
     char* szTimeLine = NULL;
 
@@ -123,7 +124,8 @@
     szTimeLine = ctime(&(sTimeBuffer.time));
 #else
     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
-    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+    t = sTimeBuffer.tv_sec;
+    szTimeLine = ctime(&t);
 #endif
   
   if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
@@ -183,24 +185,12 @@
 string CTimeSpan::GetDateStamp()
 {
   std::string strDateStamp = "";
-
-#ifdef _WIN32
-  struct timeb sTimeBuffer;
-#else
-  struct timeval sTimeBuffer;
-  struct timezone sTimezoneBuffer;
-#endif
   char* szTimeLine = NULL;
+  time_t t;
 
-#ifdef _WIN32
-    ftime(&sTimeBuffer);
-    szTimeLine = ctime(&(sTimeBuffer.time));
-#else
-    gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
-    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
-#endif
+  t = time(NULL);
+  szTimeLine = ctime(&t);
 
- 
   // Format is:
   // Wed Jun 22 10:22:00 2005
   // 0123456789012345678901234

Modified: trunk/Src/DasherCore/UserLog.cpp
==============================================================================
--- trunk/Src/DasherCore/UserLog.cpp	(original)
+++ trunk/Src/DasherCore/UserLog.cpp	Tue Mar  3 19:06:01 2009
@@ -652,22 +652,11 @@
   else
   {
     m_strFilename = USER_LOG_DETAILED_PREFIX;
-
-#ifdef _WIN32
-    struct timeb sTimeBuffer;
-#else
-    struct timeval sTimeBuffer;
-    struct timezone sTimezoneBuffer;
-#endif
     char* szTimeLine = NULL;
+    time_t t;
 
-#ifdef _WIN32
-    ftime(&sTimeBuffer);
-    szTimeLine = ctime(&(sTimeBuffer.time));
-#else
-    gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
-    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
-#endif
+    t = time(NULL);
+    szTimeLine = ctime(&t);
 
     if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
     {
@@ -686,7 +675,6 @@
   // Make sure we store a fully qualified form, to prevent movent
   // if the working directory changes
   m_strFilename = CFileLogger::GetFullFilenamePath(m_strFilename);
-
 }
 
 // Find out what level mask this object was created with