This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new ef83443 fix: Update the itemCount variable form uint 8 to uint 16
ef83443 is described below
commit ef83443a4a1ab675c1cfea89b6daa6a6c98ac7e1
Author: Christofer Dutz <[email protected]>
AuthorDate: Fri Apr 16 16:29:37 2021 +0200
fix: Update the itemCount variable form uint 8 to uint 16
---
.../resources/templates/c/pojo-template.c.ftlh | 2 +-
.../generated-sources/modbus/src/modbus_pdu.c | 22 +++++++++++-----------
.../generated-sources/s7/src/cotp_parameter.c | 2 +-
.../plc4c/generated-sources/s7/src/s7_parameter.c | 6 +++---
.../plc4c/generated-sources/s7/src/s7_payload.c | 8 ++++----
.../s7/src/s7_payload_user_data_item.c | 2 +-
.../s7/src/s7_var_payload_data_item.c | 2 +-
.../generated-sources/s7/src/szl_data_tree_item.c | 2 +-
8 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/build-utils/language-c/src/main/resources/templates/c/pojo-template.c.ftlh
b/build-utils/language-c/src/main/resources/templates/c/pojo-template.c.ftlh
index d422999..99c0acc 100644
--- a/build-utils/language-c/src/main/resources/templates/c/pojo-template.c.ftlh
+++ b/build-utils/language-c/src/main/resources/templates/c/pojo-template.c.ftlh
@@ -145,7 +145,7 @@ plc4c_return_code
${helper.getCTypeName(type.name)}_parse(plc4c_spi_read_buffer*
<#if indentContent> </#if> {
<#if helper.isCountArrayField(field)>
<#if indentContent> </#if> // Count array
-<#if indentContent> </#if> uint8_t itemCount =
${helper.toParseExpression(baseType, arrayField, arrayField.loopExpression,
baseType.parserArguments)};
+<#if indentContent> </#if> uint16_t itemCount =
${helper.toParseExpression(baseType, arrayField, arrayField.loopExpression,
baseType.parserArguments)};
<#if indentContent> </#if> for(int curItem = 0; curItem < itemCount;
curItem++) {
<#if indentContent> </#if> <#if
!helper.isSimpleTypeReference(arrayField.type)>bool lastItem = curItem ==
(itemCount - 1);</#if>
<#-- Inizialize a local variable with the simple type (Intentionally
keeping the java-style names so they can be used in expressions) -->
diff --git a/sandbox/plc4c/generated-sources/modbus/src/modbus_pdu.c
b/sandbox/plc4c/generated-sources/modbus/src/modbus_pdu.c
index ca4bfd5..9c2fe9f 100644
--- a/sandbox/plc4c/generated-sources/modbus/src/modbus_pdu.c
+++ b/sandbox/plc4c/generated-sources/modbus/src/modbus_pdu.c
@@ -204,7 +204,7 @@ plc4c_return_code
plc4c_modbus_read_write_modbus_pdu_parse(plc4c_spi_read_buffer
}
{
// Count array
- uint8_t itemCount = byteCount;
+ uint16_t itemCount = byteCount;
for(int curItem = 0; curItem < itemCount; curItem++) {
int8_t* _value = malloc(sizeof(int8_t));
@@ -260,7 +260,7 @@ plc4c_return_code
plc4c_modbus_read_write_modbus_pdu_parse(plc4c_spi_read_buffer
}
{
// Count array
- uint8_t itemCount = byteCount;
+ uint16_t itemCount = byteCount;
for(int curItem = 0; curItem < itemCount; curItem++) {
int8_t* _value = malloc(sizeof(int8_t));
@@ -358,7 +358,7 @@ plc4c_return_code
plc4c_modbus_read_write_modbus_pdu_parse(plc4c_spi_read_buffer
}
{
// Count array
- uint8_t itemCount = byteCount;
+ uint16_t itemCount = byteCount;
for(int curItem = 0; curItem < itemCount; curItem++) {
int8_t* _value = malloc(sizeof(int8_t));
@@ -436,7 +436,7 @@ plc4c_return_code
plc4c_modbus_read_write_modbus_pdu_parse(plc4c_spi_read_buffer
}
{
// Count array
- uint8_t itemCount = byteCount;
+ uint16_t itemCount = byteCount;
for(int curItem = 0; curItem < itemCount; curItem++) {
int8_t* _value = malloc(sizeof(int8_t));
@@ -492,7 +492,7 @@ plc4c_return_code
plc4c_modbus_read_write_modbus_pdu_parse(plc4c_spi_read_buffer
}
{
// Count array
- uint8_t itemCount = byteCount;
+ uint16_t itemCount = byteCount;
for(int curItem = 0; curItem < itemCount; curItem++) {
int8_t* _value = malloc(sizeof(int8_t));
@@ -590,7 +590,7 @@ plc4c_return_code
plc4c_modbus_read_write_modbus_pdu_parse(plc4c_spi_read_buffer
}
{
// Count array
- uint8_t itemCount = byteCount;
+ uint16_t itemCount = byteCount;
for(int curItem = 0; curItem < itemCount; curItem++) {
int8_t* _value = malloc(sizeof(int8_t));
@@ -686,7 +686,7 @@ plc4c_return_code
plc4c_modbus_read_write_modbus_pdu_parse(plc4c_spi_read_buffer
}
{
// Count array
- uint8_t itemCount = byteCount;
+ uint16_t itemCount = byteCount;
for(int curItem = 0; curItem < itemCount; curItem++) {
int8_t* _value = malloc(sizeof(int8_t));
@@ -720,7 +720,7 @@ plc4c_return_code
plc4c_modbus_read_write_modbus_pdu_parse(plc4c_spi_read_buffer
}
{
// Count array
- uint8_t itemCount = byteCount;
+ uint16_t itemCount = byteCount;
for(int curItem = 0; curItem < itemCount; curItem++) {
int8_t* _value = malloc(sizeof(int8_t));
@@ -839,7 +839,7 @@ plc4c_return_code
plc4c_modbus_read_write_modbus_pdu_parse(plc4c_spi_read_buffer
}
{
// Count array
- uint8_t itemCount = fifoCount;
+ uint16_t itemCount = fifoCount;
for(int curItem = 0; curItem < itemCount; curItem++) {
uint16_t* _value = malloc(sizeof(uint16_t));
@@ -1126,7 +1126,7 @@ plc4c_return_code
plc4c_modbus_read_write_modbus_pdu_parse(plc4c_spi_read_buffer
}
{
// Count array
- uint8_t itemCount = (byteCount) - (6);
+ uint16_t itemCount = (byteCount) - (6);
for(int curItem = 0; curItem < itemCount; curItem++) {
int8_t* _value = malloc(sizeof(int8_t));
@@ -1163,7 +1163,7 @@ plc4c_return_code
plc4c_modbus_read_write_modbus_pdu_parse(plc4c_spi_read_buffer
}
{
// Count array
- uint8_t itemCount = byteCount;
+ uint16_t itemCount = byteCount;
for(int curItem = 0; curItem < itemCount; curItem++) {
int8_t* _value = malloc(sizeof(int8_t));
diff --git a/sandbox/plc4c/generated-sources/s7/src/cotp_parameter.c
b/sandbox/plc4c/generated-sources/s7/src/cotp_parameter.c
index 8721578..fed2d8d 100644
--- a/sandbox/plc4c/generated-sources/s7/src/cotp_parameter.c
+++ b/sandbox/plc4c/generated-sources/s7/src/cotp_parameter.c
@@ -140,7 +140,7 @@ plc4c_return_code
plc4c_s7_read_write_cotp_parameter_parse(plc4c_spi_read_buffer
}
{
// Count array
- uint8_t itemCount = rest;
+ uint16_t itemCount = rest;
for(int curItem = 0; curItem < itemCount; curItem++) {
uint8_t* _value = malloc(sizeof(uint8_t));
diff --git a/sandbox/plc4c/generated-sources/s7/src/s7_parameter.c
b/sandbox/plc4c/generated-sources/s7/src/s7_parameter.c
index 4c05232..e01be24 100644
--- a/sandbox/plc4c/generated-sources/s7/src/s7_parameter.c
+++ b/sandbox/plc4c/generated-sources/s7/src/s7_parameter.c
@@ -142,7 +142,7 @@ plc4c_return_code
plc4c_s7_read_write_s7_parameter_parse(plc4c_spi_read_buffer*
}
{
// Count array
- uint8_t itemCount = numItems;
+ uint16_t itemCount = numItems;
for(int curItem = 0; curItem < itemCount; curItem++) {
bool lastItem = curItem == (itemCount - 1);
plc4c_s7_read_write_s7_var_request_parameter_item* _value = NULL;
@@ -188,7 +188,7 @@ plc4c_return_code
plc4c_s7_read_write_s7_parameter_parse(plc4c_spi_read_buffer*
}
{
// Count array
- uint8_t itemCount = numItems;
+ uint16_t itemCount = numItems;
for(int curItem = 0; curItem < itemCount; curItem++) {
bool lastItem = curItem == (itemCount - 1);
plc4c_s7_read_write_s7_var_request_parameter_item* _value = NULL;
@@ -234,7 +234,7 @@ plc4c_return_code
plc4c_s7_read_write_s7_parameter_parse(plc4c_spi_read_buffer*
}
{
// Count array
- uint8_t itemCount = numItems;
+ uint16_t itemCount = numItems;
for(int curItem = 0; curItem < itemCount; curItem++) {
bool lastItem = curItem == (itemCount - 1);
plc4c_s7_read_write_s7_parameter_user_data_item* _value = NULL;
diff --git a/sandbox/plc4c/generated-sources/s7/src/s7_payload.c
b/sandbox/plc4c/generated-sources/s7/src/s7_payload.c
index 589273e..eb4fda5 100644
--- a/sandbox/plc4c/generated-sources/s7/src/s7_payload.c
+++ b/sandbox/plc4c/generated-sources/s7/src/s7_payload.c
@@ -75,7 +75,7 @@ plc4c_return_code
plc4c_s7_read_write_s7_payload_parse(plc4c_spi_read_buffer* io
}
{
// Count array
- uint8_t itemCount = ((plc4c_s7_read_write_s7_parameter*)
(parameter))->s7_parameter_read_var_response_num_items;
+ uint16_t itemCount = ((plc4c_s7_read_write_s7_parameter*)
(parameter))->s7_parameter_read_var_response_num_items;
for(int curItem = 0; curItem < itemCount; curItem++) {
bool lastItem = curItem == (itemCount - 1);
plc4c_s7_read_write_s7_var_payload_data_item* _value = NULL;
@@ -100,7 +100,7 @@ plc4c_return_code
plc4c_s7_read_write_s7_payload_parse(plc4c_spi_read_buffer* io
}
{
// Count array
- uint8_t itemCount =
plc4c_spi_evaluation_helper_count(((plc4c_s7_read_write_s7_parameter*)
(parameter))->s7_parameter_write_var_request_items);
+ uint16_t itemCount =
plc4c_spi_evaluation_helper_count(((plc4c_s7_read_write_s7_parameter*)
(parameter))->s7_parameter_write_var_request_items);
for(int curItem = 0; curItem < itemCount; curItem++) {
bool lastItem = curItem == (itemCount - 1);
plc4c_s7_read_write_s7_var_payload_data_item* _value = NULL;
@@ -125,7 +125,7 @@ plc4c_return_code
plc4c_s7_read_write_s7_payload_parse(plc4c_spi_read_buffer* io
}
{
// Count array
- uint8_t itemCount = ((plc4c_s7_read_write_s7_parameter*)
(parameter))->s7_parameter_write_var_response_num_items;
+ uint16_t itemCount = ((plc4c_s7_read_write_s7_parameter*)
(parameter))->s7_parameter_write_var_response_num_items;
for(int curItem = 0; curItem < itemCount; curItem++) {
bool lastItem = curItem == (itemCount - 1);
plc4c_s7_read_write_s7_var_payload_status_item* _value = NULL;
@@ -150,7 +150,7 @@ plc4c_return_code
plc4c_s7_read_write_s7_payload_parse(plc4c_spi_read_buffer* io
}
{
// Count array
- uint8_t itemCount =
plc4c_spi_evaluation_helper_count(((plc4c_s7_read_write_s7_parameter*)
(parameter))->s7_parameter_user_data_items);
+ uint16_t itemCount =
plc4c_spi_evaluation_helper_count(((plc4c_s7_read_write_s7_parameter*)
(parameter))->s7_parameter_user_data_items);
for(int curItem = 0; curItem < itemCount; curItem++) {
bool lastItem = curItem == (itemCount - 1);
plc4c_s7_read_write_s7_payload_user_data_item* _value = NULL;
diff --git a/sandbox/plc4c/generated-sources/s7/src/s7_payload_user_data_item.c
b/sandbox/plc4c/generated-sources/s7/src/s7_payload_user_data_item.c
index 5da7946..eba4c59 100644
--- a/sandbox/plc4c/generated-sources/s7/src/s7_payload_user_data_item.c
+++ b/sandbox/plc4c/generated-sources/s7/src/s7_payload_user_data_item.c
@@ -141,7 +141,7 @@ plc4c_return_code
plc4c_s7_read_write_s7_payload_user_data_item_parse(plc4c_spi_
}
{
// Count array
- uint8_t itemCount = szlItemCount;
+ uint16_t itemCount = szlItemCount;
for(int curItem = 0; curItem < itemCount; curItem++) {
bool lastItem = curItem == (itemCount - 1);
plc4c_s7_read_write_szl_data_tree_item* _value = NULL;
diff --git a/sandbox/plc4c/generated-sources/s7/src/s7_var_payload_data_item.c
b/sandbox/plc4c/generated-sources/s7/src/s7_var_payload_data_item.c
index dd55a5e..29d3e9f 100644
--- a/sandbox/plc4c/generated-sources/s7/src/s7_var_payload_data_item.c
+++ b/sandbox/plc4c/generated-sources/s7/src/s7_var_payload_data_item.c
@@ -67,7 +67,7 @@ plc4c_return_code
plc4c_s7_read_write_s7_var_payload_data_item_parse(plc4c_spi_r
}
{
// Count array
- uint8_t itemCount =
((plc4c_s7_read_write_data_transport_size_get_size_in_bits(transportSize)) ?
plc4c_spi_evaluation_helper_ceil((dataLength) / (8.0)) : dataLength);
+ uint16_t itemCount =
((plc4c_s7_read_write_data_transport_size_get_size_in_bits(transportSize)) ?
plc4c_spi_evaluation_helper_ceil((dataLength) / (8.0)) : dataLength);
for(int curItem = 0; curItem < itemCount; curItem++) {
int8_t* _value = malloc(sizeof(int8_t));
diff --git a/sandbox/plc4c/generated-sources/s7/src/szl_data_tree_item.c
b/sandbox/plc4c/generated-sources/s7/src/szl_data_tree_item.c
index f9170dc..58e7f09 100644
--- a/sandbox/plc4c/generated-sources/s7/src/szl_data_tree_item.c
+++ b/sandbox/plc4c/generated-sources/s7/src/szl_data_tree_item.c
@@ -52,7 +52,7 @@ plc4c_return_code
plc4c_s7_read_write_szl_data_tree_item_parse(plc4c_spi_read_bu
}
{
// Count array
- uint8_t itemCount = 20;
+ uint16_t itemCount = 20;
for(int curItem = 0; curItem < itemCount; curItem++) {
int8_t* _value = malloc(sizeof(int8_t));
