From 03333c2af0cc698646f617812fc183a2627ce974 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Thu, 30 Apr 2020 21:37:02 +0200 Subject: [PATCH] pool raw acces printout --- container/SinglyLinkedList.h | 2 +- datapool/PoolRawAccessHelper.cpp | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/container/SinglyLinkedList.h b/container/SinglyLinkedList.h index b926bd00..54e7687c 100644 --- a/container/SinglyLinkedList.h +++ b/container/SinglyLinkedList.h @@ -62,7 +62,7 @@ public: } void setEnd() { - this->next = NULL; + this->next = nullptr; } LinkedElement* begin() { diff --git a/datapool/PoolRawAccessHelper.cpp b/datapool/PoolRawAccessHelper.cpp index 31c0b6f2..91d6309f 100644 --- a/datapool/PoolRawAccessHelper.cpp +++ b/datapool/PoolRawAccessHelper.cpp @@ -34,7 +34,8 @@ ReturnValue_t PoolRawAccessHelper::serialize(uint8_t **buffer, size_t *size, } } if(remainingParametersSize != 0) { - sif::debug << "Pool Raw Access: Remaining parameters size not 0 !" << std::endl; + sif::debug << "PoolRawAccessHelper: " + "Remaining parameters size not 0 !" << std::endl; result = RETURN_FAILED; } return result; @@ -56,7 +57,8 @@ ReturnValue_t PoolRawAccessHelper::serializeWithValidityMask(uint8_t ** buffer, } } if(remainingParametersSize != 0) { - sif::debug << "Pool Raw Access: Remaining parameters size not 0 !" << std::endl; + sif::debug << "PoolRawAccessHelper: Remaining " + "parameters size not 0 !" << std::endl; result = RETURN_FAILED; } @@ -75,7 +77,7 @@ ReturnValue_t PoolRawAccessHelper::serializeCurrentPoolEntryIntoBuffer( ReturnValue_t result = AutoSerializeAdapter::deSerialize(¤tPoolId, &poolIdBuffer,remainingParameters, false); if(result != RETURN_OK) { - sif::debug << std::hex << "Pool Raw Access Helper: Error deSeralizing " + sif::debug << std::hex << "PoolRawAccessHelper: Error deSeralizing " "pool IDs" << std::dec << std::endl; return result; } @@ -96,7 +98,7 @@ ReturnValue_t PoolRawAccessHelper::handlePoolEntrySerialization( while(not poolEntrySerialized) { if(counter > DataSet::DATA_SET_MAX_SIZE) { - sif::error << "Pool Raw Access Helper: Config error, " + sif::error << "PoolRawAccessHelper: Config error, " "max. number of possible data set variables exceeded" << std::endl; return result; @@ -110,9 +112,8 @@ ReturnValue_t PoolRawAccessHelper::handlePoolEntrySerialization( result = currentDataSet.read(); if (result != RETURN_OK) { - sif::debug << std::hex << "Pool Raw Access Helper: Error reading raw " - "dataset with returncode 0x" - << result << std::dec << std::endl; + sif::debug << std::hex << "PoolRawAccessHelper: Error reading raw " + "dataset with returncode 0x" << result << std::dec << std::endl; return result; }