This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch feature/plc4c-memory-cleanup in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 7fe9c2e5320b74d5cc3c8d72aef5e2294b2a06f9 Author: cdutz <[email protected]> AuthorDate: Mon May 24 13:06:24 2021 +0200 Pulled latest changes from the PR and from develop --- .../plc4c/generated-sources/s7/src/cotp_packet.c | 8 ++++---- .../plc4c/generated-sources/s7/src/s7_message.c | 16 +++++++-------- .../s7/src/s7_parameter_user_data_item.c | 24 +++++++++++----------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sandbox/plc4c/generated-sources/s7/src/cotp_packet.c b/sandbox/plc4c/generated-sources/s7/src/cotp_packet.c index 6e8cb2d..b1991f5 100644 --- a/sandbox/plc4c/generated-sources/s7/src/cotp_packet.c +++ b/sandbox/plc4c/generated-sources/s7/src/cotp_packet.c @@ -273,10 +273,10 @@ plc4c_return_code plc4c_s7_read_write_cotp_packet_parse(plc4c_spi_read_buffer* r curPos = plc4c_spi_read_get_pos(readBuffer) - startPos; plc4c_s7_read_write_s7_message* payload = NULL; if((curPos) < (cotpLen)) { - payload = malloc(sizeof(plc4c_s7_read_write_s7_message)); - if(payload == NULL) { - return NO_MEMORY; - } + //payload = malloc(sizeof(plc4c_s7_read_write_s7_message)); + //if(payload == NULL) { + // return NO_MEMORY; + //} _res = plc4c_s7_read_write_s7_message_parse(readBuffer, &payload); if(_res != OK) { return _res; diff --git a/sandbox/plc4c/generated-sources/s7/src/s7_message.c b/sandbox/plc4c/generated-sources/s7/src/s7_message.c index b068140..63bee7a 100644 --- a/sandbox/plc4c/generated-sources/s7/src/s7_message.c +++ b/sandbox/plc4c/generated-sources/s7/src/s7_message.c @@ -177,10 +177,10 @@ plc4c_return_code plc4c_s7_read_write_s7_message_parse(plc4c_spi_read_buffer* re // Optional Field (parameter) (Can be skipped, if a given expression evaluates to false) plc4c_s7_read_write_s7_parameter* parameter = NULL; if((parameterLength) > (0)) { - parameter = malloc(sizeof(plc4c_s7_read_write_s7_parameter)); - if(parameter == NULL) { - return NO_MEMORY; - } + //parameter = malloc(sizeof(plc4c_s7_read_write_s7_parameter)); + //if(parameter == NULL) { + // return NO_MEMORY; + //} _res = plc4c_s7_read_write_s7_parameter_parse(readBuffer, messageType, ¶meter); if(_res != OK) { return _res; @@ -193,10 +193,10 @@ plc4c_return_code plc4c_s7_read_write_s7_message_parse(plc4c_spi_read_buffer* re // Optional Field (payload) (Can be skipped, if a given expression evaluates to false) plc4c_s7_read_write_s7_payload* payload = NULL; if((payloadLength) > (0)) { - payload = malloc(sizeof(plc4c_s7_read_write_s7_payload)); - if(payload == NULL) { - return NO_MEMORY; - } + //payload = malloc(sizeof(plc4c_s7_read_write_s7_payload)); + //if(payload == NULL) { + // return NO_MEMORY; + //} _res = plc4c_s7_read_write_s7_payload_parse(readBuffer, messageType, parameter, &payload); if(_res != OK) { return _res; diff --git a/sandbox/plc4c/generated-sources/s7/src/s7_parameter_user_data_item.c b/sandbox/plc4c/generated-sources/s7/src/s7_parameter_user_data_item.c index de5bc98..e74bccc 100644 --- a/sandbox/plc4c/generated-sources/s7/src/s7_parameter_user_data_item.c +++ b/sandbox/plc4c/generated-sources/s7/src/s7_parameter_user_data_item.c @@ -131,10 +131,10 @@ plc4c_return_code plc4c_s7_read_write_s7_parameter_user_data_item_parse(plc4c_sp // Optional Field (dataUnitReferenceNumber) (Can be skipped, if a given expression evaluates to false) uint8_t* dataUnitReferenceNumber = NULL; if((cpuFunctionType) == (8)) { - dataUnitReferenceNumber = malloc(sizeof(uint8_t)); - if(dataUnitReferenceNumber == NULL) { - return NO_MEMORY; - } + //dataUnitReferenceNumber = malloc(sizeof(uint8_t)); + //if(dataUnitReferenceNumber == NULL) { + // return NO_MEMORY; + //} *dataUnitReferenceNumber = 0; _res = plc4c_spi_read_unsigned_byte(readBuffer, 8, (uint8_t*) dataUnitReferenceNumber); if(_res != OK) { @@ -150,10 +150,10 @@ plc4c_return_code plc4c_s7_read_write_s7_parameter_user_data_item_parse(plc4c_sp // Optional Field (lastDataUnit) (Can be skipped, if a given expression evaluates to false) uint8_t* lastDataUnit = NULL; if((cpuFunctionType) == (8)) { - lastDataUnit = malloc(sizeof(uint8_t)); - if(lastDataUnit == NULL) { - return NO_MEMORY; - } + //lastDataUnit = malloc(sizeof(uint8_t)); + //if(lastDataUnit == NULL) { + // return NO_MEMORY; + //} *lastDataUnit = 0; _res = plc4c_spi_read_unsigned_byte(readBuffer, 8, (uint8_t*) lastDataUnit); if(_res != OK) { @@ -169,10 +169,10 @@ plc4c_return_code plc4c_s7_read_write_s7_parameter_user_data_item_parse(plc4c_sp // Optional Field (errorCode) (Can be skipped, if a given expression evaluates to false) uint16_t* errorCode = NULL; if((cpuFunctionType) == (8)) { - errorCode = malloc(sizeof(uint16_t)); - if(errorCode == NULL) { - return NO_MEMORY; - } + //errorCode = malloc(sizeof(uint16_t)); + //if(errorCode == NULL) { + // return NO_MEMORY; + //} *errorCode = 0; _res = plc4c_spi_read_unsigned_short(readBuffer, 16, (uint16_t*) errorCode); if(_res != OK) {
