diff --git a/DateTimeCore.cpp b/DateTimeCore.cpp index 539bbdf..6dade96 100644 --- a/DateTimeCore.cpp +++ b/DateTimeCore.cpp @@ -207,7 +207,7 @@ char const * GetTimeStr( const char * TimeSeparator ) } //--------------------------------------------------------------------------- -char const * GetDateTimeStr( const char * DateSeparator, const char * TimeSeparator ) +char const * GetDateTimeStr( const char * DateSeparator, const char * TimeSeparator, const char * Separator ) { unsigned char Day; unsigned char Month; @@ -221,8 +221,9 @@ char const * GetDateTimeStr( const char * DateSeparator, const char * TimeSepar GetTime( Hours, Minutes, Seconds ); // Build String - sprintf( ReturnStr, "%04d%s%02d%s%02d %02d%s%02d%s%02d", + sprintf( ReturnStr, "%04d%s%02d%s%02d%s%02d%s%02d%s%02d", Year, ((DateSeparator)? DateSeparator : ""), Month, ((DateSeparator)? DateSeparator : ""), Day, + Separator, Hours, ((TimeSeparator)? TimeSeparator : ""), Minutes, ((TimeSeparator)? TimeSeparator : ""), Seconds ); return (ReturnStr); diff --git a/DateTimeCore.h b/DateTimeCore.h index dcd9257..b744965 100644 --- a/DateTimeCore.h +++ b/DateTimeCore.h @@ -29,7 +29,7 @@ bool SetDateTime( unsigned char Day, unsigned char Month, unsigned Year, char const * GetDateStr( const char * DateSeparator = "/" ); char const * GetTimeStr( const char * TimeSeparator = ":" ); -char const * GetDateTimeStr( const char * DateSeparator = "/", const char * TimeSeparator = ":" ); +char const * GetDateTimeStr( const char * DateSeparator = "/", const char * TimeSeparator = ":", const char * Separator = " " ); //---------------------------------------------------------------------------