[Opalvoip-svn] SF.net SVN: opalvoip:[34882] ptlib/trunk/src/ptlib/common/ptime.cxx

[<rjo...@us...>]

Revision: 34882
          http://sourceforge.net/p/opalvoip/code/34882
Author:   rjongbloed
Date:     2016-07-26 09:14:33 +0000 (Tue, 26 Jul 2016)
Log Message:
-----------
Fixed extra colon output if PTimeInterval displays days.

Modified Paths:
--------------
    ptlib/trunk/src/ptlib/common/ptime.cxx

Modified: ptlib/trunk/src/ptlib/common/ptime.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/ptime.cxx	2016-07-25 17:56:17 UTC (rev 34881)
+++ ptlib/trunk/src/ptlib/common/ptime.cxx	2016-07-26 09:14:33 UTC (rev 34882)
@@ -111,32 +111,26 @@
   if (format == SecondsOnly)
     str << ns/SecsToNano;
   else {
-    bool hadPrevious = false;
+    std::streamsize digits = 1;
 
     if (format == IncludeDays && (ns > DaysToNano || width > (precision + 10))) {
       str << ns/DaysToNano << 'd';
       ns = ns % DaysToNano;
-      hadPrevious = true;
+      digits = 2;
     }
 
-    if (hadPrevious || ns > HoursToNano || width > (precision + 7)) {
-      if (hadPrevious)
-        str << ':' << setw(2);
-      str << ns/HoursToNano;
-      hadPrevious = true;
+    if (digits > 1 || ns > HoursToNano || width > (precision + 7)) {
+      str << setw(digits) << ns/HoursToNano << ':';
+      digits = 2;
     }
 
     ns = ns % HoursToNano;
-    if (hadPrevious || ns > MinsToNano || width > (precision + 4)) {
-      if (hadPrevious)
-        str << ':' << setw(2);
-      str << ns/MinsToNano;
-      hadPrevious = true;
+    if (digits > 1 || ns > MinsToNano || width > (precision + 4)) {
+      str << setw(digits) << ns/MinsToNano << ':';
+      digits = 2;
     }
 
-    if (hadPrevious)
-      str << ':' << setw(2);
-    str << (ns % MinsToNano) / SecsToNano;
+    str << setw(digits) << (ns % MinsToNano)/SecsToNano;
   }
 
   ns = ns%SecsToNano;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.