Changeset 33146

Timestamp:

02/18/15 02:15:38 (8 years ago)

Author:

obi

Message:

fix

File:

• titan/titan/global.h (modified) (2 diffs)

titan/titan/global.h

@@ -2161 +2161 @@
 }
 
-char* convert_timesec2(int sec)
-{
-        int hrs = 0, mins = 0, days = 0;
+char* convert_dtimesec(int sec)
+{
+        int hour = 0, min = 0, seconds = 0, days = 0;
         char* buf = NULL;
 
-        buf = malloc(9);
+        buf = malloc(12);
         if(buf == NULL)
         {
@@ -2173 +2173 @@
         }
 
-        mins = (sec / 60) % 60;
-        hrs = mins / 60;
-
-        if(mins < 0) mins = 0;
-        if(hrs < 0) hrs = 0;
-        if(mins < 60) hrs = 0;
-
-        if(hrs < 24)
-        {
-                days = 0;
-                hrs = hrs % 24;
-        }
-        else
-        {
-                days = hrs / 24;
-                hrs = hrs % 24;
-        }
-        if(hrs < 0) hrs = 0;
-        if(days < 0) days = 0;
-
-        snprintf(buf, 9, "%02dDays %02dHrs %02dMin", days, hrs, mins);
+        seconds = sec % 60;
+        min = (sec / 60) % 60;
+        hour = sec / 3600;
+        if(hour > 23)
+        {
+                days = hour / 24;
+                hour = hour % 24;
+        }
+
+        if(seconds < 0) seconds = 0;
+        if(min < 0) min = 0;
+        if(hour < 0/* || hour > 23*/)
+        {
+                hour = 0;
+                min = 0;
+                seconds = 0;
+        }
+
+        snprintf(buf, 12, "%02d_%02d:%02d:%02d",days, hour, min, seconds);
 
         return buf;