wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make generated timestamps conform to ISO definition

Browse Source
This commit is contained in:
Ingo Fischer
2018-03-28 14:26:06 +02:00
parent 6d3bb00d97
commit 2a2fbc372a
2 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mbus/mbus-protocol.c
View File

@ -3739,7 +3739,7 @@ mbus_hex_dump(const char *label, const char *buff, size_t len)
{
time_t rawtime;
struct tm * timeinfo;
char timestamp[21];
char timestamp[22];
size_t i;
if (label == NULL || buff == NULL)
@ -3748,7 +3748,7 @@ mbus_hex_dump(const char *label, const char *buff, size_t len)
time ( &rawtime );
timeinfo = gmtime ( &rawtime );
strftime(timestamp,20,"%Y-%m-%d %H:%M:%S",timeinfo);
strftime(timestamp,21,"%Y-%m-%d %H:%M:%SZ",timeinfo);
fprintf(stderr, "[%s] %s (%03zu):", timestamp, label, len);
for (i = 0; i < len; i++)
@ -3767,6 +3767,7 @@ mbus_data_error_print(int error)
return -1;
}
//------------------------------------------------------------------------------
//
// XML RELATED FUNCTIONS
@ -3886,7 +3887,7 @@ mbus_data_variable_record_xml(mbus_data_record *record, int record_cnt, int fram
char str_encoded[768];
size_t len = 0;
struct tm * timeinfo;
char timestamp[21];
char timestamp[22];
long tariff;
if (record)
@ -3942,7 +3943,7 @@ mbus_data_variable_record_xml(mbus_data_record *record, int record_cnt, int fram
if (record->timestamp > 0)
{
timeinfo = gmtime (&(record->timestamp));
strftime(timestamp,20,"%Y-%m-%dT%H:%M:%S",timeinfo);
strftime(timestamp,21,"%Y-%m-%dT%H:%M:%SZ",timeinfo);
len += snprintf(&buff[len], sizeof(buff) - len,
" <Timestamp>%s</Timestamp>\n", timestamp);
}