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

Added access to DRH in xml output function for data records

Browse Source
This commit is contained in:
Stefan Wahren 2012-05-14 00:26:41 +02:00
parent 5a7e69f90d
commit 4178ffceb1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mbus/mbus-protocol.c
View File

@ -3045,7 +3045,7 @@ mbus_data_variable_header_xml(mbus_data_variable_header *header)
/// Generate XML for a single variable-length data record /// Generate XML for a single variable-length data record
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
char * char *
mbus_data_variable_record_xml(mbus_data_record *record, int record_cnt, int frame_cnt) mbus_data_variable_record_xml(mbus_data_record *record, int record_cnt, int frame_cnt, mbus_data_variable_header *header)
{ {
static char buff[8192]; static char buff[8192];
char str_encoded[768]; char str_encoded[768];
@ -3119,7 +3119,7 @@ mbus_data_variable_xml(mbus_data_variable *data)
for (record = data->record, i = 0; record; record = record->next, i++) for (record = data->record, i = 0; record; record = record->next, i++)
{ {
len += snprintf(&buff[len], sizeof(buff) - len, "%s", len += snprintf(&buff[len], sizeof(buff) - len, "%s",
mbus_data_variable_record_xml(record, i, -1)); mbus_data_variable_record_xml(record, i, -1, &(data->header)));
} }
len += snprintf(&buff[len], sizeof(buff) - len, "</MBusData>\n"); len += snprintf(&buff[len], sizeof(buff) - len, "</MBusData>\n");
@ -3309,7 +3309,7 @@ mbus_frame_xml(mbus_frame *frame)
for (record = frame_data.data_var.record; record; record = record->next, record_cnt++) for (record = frame_data.data_var.record; record; record = record->next, record_cnt++)
{ {
len += snprintf(&buff[len], sizeof(buff) - len, "%s", len += snprintf(&buff[len], sizeof(buff) - len, "%s",
mbus_data_variable_record_xml(record, record_cnt, frame_cnt)); mbus_data_variable_record_xml(record, record_cnt, frame_cnt, &(frame_data.data_var.header)));
} }
// free all records in the list // free all records in the list
@ -3333,7 +3333,7 @@ mbus_frame_xml(mbus_frame *frame)
for (record = frame_data.data_var.record; record; record = record->next, record_cnt++) for (record = frame_data.data_var.record; record; record = record->next, record_cnt++)
{ {
len += snprintf(&buff[len], sizeof(buff) - len, "%s", len += snprintf(&buff[len], sizeof(buff) - len, "%s",
mbus_data_variable_record_xml(record, record_cnt, frame_cnt)); mbus_data_variable_record_xml(record, record_cnt, frame_cnt, &(frame_data.data_var.header)));
} }
// free all records in the list // free all records in the list