From 06ae64d59c7de1bfaa63c63249cc56c53c47d829 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sun, 5 Apr 2020 15:46:10 +0200 Subject: [PATCH] CSB: replaced some uint32 with size_t --- tmtcservices/CommandingServiceBase.cpp | 6 +++--- tmtcservices/CommandingServiceBase.h | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tmtcservices/CommandingServiceBase.cpp b/tmtcservices/CommandingServiceBase.cpp index d70b90428..8d207d9c2 100644 --- a/tmtcservices/CommandingServiceBase.cpp +++ b/tmtcservices/CommandingServiceBase.cpp @@ -219,8 +219,8 @@ void CommandingServiceBase::handleRequestQueue() { void CommandingServiceBase::sendTmPacket(uint8_t subservice, - const uint8_t* data, uint32_t dataLen, const uint8_t* headerData, - uint32_t headerSize) { + const uint8_t* data, size_t dataLen, const uint8_t* headerData, + size_t headerSize) { TmPacketStored tmPacketStored(this->apid, this->service, subservice, this->tmPacketCounter, data, dataLen, headerData, headerSize); ReturnValue_t result = tmPacketStored.sendPacket( @@ -232,7 +232,7 @@ void CommandingServiceBase::sendTmPacket(uint8_t subservice, void CommandingServiceBase::sendTmPacket(uint8_t subservice, - object_id_t objectId, const uint8_t *data, uint32_t dataLen) { + object_id_t objectId, const uint8_t *data, size_t dataLen) { uint8_t buffer[sizeof(object_id_t)]; uint8_t* pBuffer = buffer; uint32_t size = 0; diff --git a/tmtcservices/CommandingServiceBase.h b/tmtcservices/CommandingServiceBase.h index a62b7397d..56e9b87de 100644 --- a/tmtcservices/CommandingServiceBase.h +++ b/tmtcservices/CommandingServiceBase.h @@ -124,7 +124,7 @@ protected: * - @c CSB or implementation specific return codes */ virtual ReturnValue_t getMessageQueueAndObject(uint8_t subservice, - const uint8_t *tcData, uint32_t tcDataLen, MessageQueueId_t *id, + const uint8_t *tcData, size_t tcDataLen, MessageQueueId_t *id, object_id_t *objectId) = 0; /** @@ -141,7 +141,7 @@ protected: * @return */ virtual ReturnValue_t prepareCommand(CommandMessage *message, - uint8_t subservice, const uint8_t *tcData, uint32_t tcDataLen, + uint8_t subservice, const uint8_t *tcData, size_t tcDataLen, uint32_t *state, object_id_t objectId) = 0; /** @@ -219,8 +219,8 @@ protected: * @param headerData HeaderData will be placed before data * @param headerSize Size of HeaderData */ - void sendTmPacket(uint8_t subservice, const uint8_t *data, uint32_t dataLen, - const uint8_t* headerData = NULL, uint32_t headerSize = 0); + void sendTmPacket(uint8_t subservice, const uint8_t *data, size_t dataLen, + const uint8_t* headerData = nullptr,size_t headerSize = 0); /** * To send TM packets of objects that still need to be serialized and consist of an object ID with appended data @@ -230,7 +230,7 @@ protected: * @param dataLen Length of Data */ void sendTmPacket(uint8_t subservice, object_id_t objectId, - const uint8_t *data, uint32_t dataLen); + const uint8_t *data, size_t dataLen); /** * To send packets has data which is in form of a SerializeIF or Adapters implementing it @@ -239,7 +239,7 @@ protected: * @param header Serialize IF header which will be placed before content */ void sendTmPacket(uint8_t subservice, SerializeIF* content, - SerializeIF* header = NULL); + SerializeIF* header = nullptr); virtual void handleUnrequestedReply(CommandMessage *reply);