core/redAcore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor Update:

Browse Source 
- DateTimeCore:
  - Change default separators for date/time, allow no separators
- JSONparseCore:
  - Bug fix: Output escape sequences in Hexadecimal
This commit is contained in:
Charl Wentzel
2017-08-23 18:03:11 +02:00
parent 5f5e89e7cd
commit 4af8f529c9
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DateTimeCore.cpp
View File

@@ -125,7 +125,7 @@ char const * GetDateStr( const char * DateSeparator )
// Build String // Build String
sprintf( ReturnStr, "%04d%s%02d%s%02d", sprintf( ReturnStr, "%04d%s%02d%s%02d",
Year, ((DateSeparator)? DateSeparator : "/"), Month, ((DateSeparator)? DateSeparator : "/"), Day ); Year, ((DateSeparator)? DateSeparator : ""), Month, ((DateSeparator)? DateSeparator : ""), Day );
// Return value // Return value
return (ReturnStr); return (ReturnStr);
@@ -143,7 +143,7 @@ char const * GetTimeStr( const char * TimeSeparator )
// Build String // Build String
sprintf( ReturnStr, "%02d%s%02d%s%02d", sprintf( ReturnStr, "%02d%s%02d%s%02d",
Hours, ((TimeSeparator)? TimeSeparator : ":"), Minutes, ((TimeSeparator)? TimeSeparator : ":"), Seconds ); Hours, ((TimeSeparator)? TimeSeparator : ""), Minutes, ((TimeSeparator)? TimeSeparator : ""), Seconds );
return (ReturnStr); return (ReturnStr);
} }
@@ -164,8 +164,8 @@ char const * GetDateTimeStr( const char * DateSeparator, const char * TimeSepar
// Build String // Build String
sprintf( ReturnStr, "%04d%s%02d%s%02d %02d%s%02d%s%02d", sprintf( ReturnStr, "%04d%s%02d%s%02d %02d%s%02d%s%02d",
Year, ((DateSeparator)? DateSeparator : "/"), Month, ((DateSeparator)? DateSeparator : "/"), Day, Year, ((DateSeparator)? DateSeparator : ""), Month, ((DateSeparator)? DateSeparator : ""), Day,
Hours, ((TimeSeparator)? TimeSeparator : ":"), Minutes, ((TimeSeparator)? TimeSeparator : ":"), Seconds ); Hours, ((TimeSeparator)? TimeSeparator : ""), Minutes, ((TimeSeparator)? TimeSeparator : ""), Seconds );
return (ReturnStr); return (ReturnStr);
} }

6
DateTimeCore.h
View File

@@ -23,9 +23,9 @@ bool GetTime( unsigned char &Hours, unsigned char &Minutes, unsigned char &Se
bool SetDate( unsigned char Day, unsigned char Month, unsigned Year ); bool SetDate( unsigned char Day, unsigned char Month, unsigned Year );
bool GetDate( unsigned char &Day, unsigned char &Month, unsigned &Year ); bool GetDate( unsigned char &Day, unsigned char &Month, unsigned &Year );
char const * GetDateStr( const char * DateSeparator = NULL ); char const * GetDateStr( const char * DateSeparator = "/" );
char const * GetTimeStr( const char * TimeSeparator = NULL ); char const * GetTimeStr( const char * TimeSeparator = ":" );
char const * GetDateTimeStr( const char * DateSeparator = NULL, const char * TimeSeparator = NULL ); char const * GetDateTimeStr( const char * DateSeparator = "/", const char * TimeSeparator = ":" );
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

2
JSONparseCore.cpp
View File

@@ -769,7 +769,7 @@ bool CJSONparse::PrintString( char * String, int Len )
case '\\': write( OutputHandle, "\\\\", 2 ); break; case '\\': write( OutputHandle, "\\\\", 2 ); break;
case '"': write( OutputHandle, "\\\"", 2 ); break; case '"': write( OutputHandle, "\\\"", 2 ); break;
default: default:
dprintf( OutputHandle, "\\u%04d", *BufPos ); dprintf( OutputHandle, "\\u%04X", (unsigned char)*BufPos );
break; break;
} }
BufPos++; BufPos++;