Use format instead of stringstream in DateTime

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index 23d0f2a5e7e223a3cdae6af23e6da121ab87d167..d609b2907cc6f1a10f81db862e7154c9d52332bd 100644 (file)
--- a/source/time/datetime.cpp
+++ b/source/time/datetime.cpp
@@ -6,9 +6,8 @@ Distributed under the LGPL
 */
 
 #include <cstdlib>
 */
 
 #include <cstdlib>

-#include <sstream>
-#include <iomanip>

 #include <stdexcept>
 #include <stdexcept>

+#include <msp/strings/format.h>

 #include "datetime.h"
 #include "timestamp.h"
 #include "units.h"
 #include "datetime.h"
 #include "timestamp.h"
 #include "units.h"


@@ -255,8 +254,7 @@ TimeStamp DateTime::get_timestamp() const
 
 string DateTime::format(const string &fmt) const
 {
 
 string DateTime::format(const string &fmt) const
 {

-       ostringstream ss;
-       ss.fill('0');
+       string result;

        for(string::const_iterator i=fmt.begin(); i!=fmt.end(); ++i)
        {
                if(*i=='%')
        for(string::const_iterator i=fmt.begin(); i!=fmt.end(); ++i)
        {
                if(*i=='%')


@@ -265,31 +263,31 @@ string DateTime::format(const string &fmt) const
                        if(i==fmt.end())
                                break;
                        else if(*i=='d')
                        if(i==fmt.end())
                                break;
                        else if(*i=='d')

-                               ss<<setw(2)<<int(mday);
+                               result += Msp::format("%02d", mday);

                        else if(*i=='H')
                        else if(*i=='H')

-                               ss<<setw(2)<<int(hour);
+                               result += Msp::format("%02d", hour);

                        else if(*i=='I')
                        else if(*i=='I')

-                               ss<<setw(2)<<hour%12;
+                               result += Msp::format("%02d", hour%12);

                        else if(*i=='m')
                        else if(*i=='m')

-                               ss<<setw(2)<<int(month);
+                               result += Msp::format("%02d", month);

                        else if(*i=='M')
                        else if(*i=='M')

-                               ss<<setw(2)<<int(minute);
+                               result += Msp::format("%02d", minute);

                        else if(*i=='p')
                        else if(*i=='p')

-                               ss<<((hour>=12) ? "PM" : "AM");
+                               result += ((hour>=12) ? "PM" : "AM");

                        else if(*i=='S')
                        else if(*i=='S')

-                               ss<<setw(2)<<int(second);
+                               result += Msp::format("%02d", second);

                        else if(*i=='y')
                        else if(*i=='y')

-                               ss<<setw(2)<<year%100;
+                               result += Msp::format("%02d", year%100);

                        else if(*i=='Y')
                        else if(*i=='Y')

-                               ss<<setw(4)<<internal<<year;
+                               result += Msp::format("%04d", year);

                        else if(*i=='%')
                        else if(*i=='%')

-                               ss<<'%';
+                               result += '%';

                }
                else
                }
                else

-                       ss<<*i;
+                       result += *i;

        }
 
        }
 

-       return ss.str();
+       return result;

 }
 
 string DateTime::format_rfc3339() const
 }
 
 string DateTime::format_rfc3339() const


@@ -297,11 +295,8 @@ string DateTime::format_rfc3339() const
        string result = format("%Y-%m-%dT%H:%M:%S");
        if(const TimeDelta &offs = zone.get_offset())
        {
        string result = format("%Y-%m-%dT%H:%M:%S");
        if(const TimeDelta &offs = zone.get_offset())
        {

-               ostringstream ss;
-               ss.fill('0');

                int m = abs(static_cast<int>(offs/Time::min));
                int m = abs(static_cast<int>(offs/Time::min));

-               ss<<(offs<zero ? '+' : '-')<<setw(2)<<m/60<<':'<<setw(2)<<m%60;
-               result += ss.str();
+               result += Msp::format("%c%02d:%02d", (offs<zero ? '+' : '-'), m/60, m%60);

        }
        else
                result += 'Z';
        }
        else
                result += 'Z';