From 30947d3901ef412f860b4758e66e9c77cd79afdb Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 3 Nov 2020 17:08:40 +0100 Subject: [PATCH] size_t changes --- tmstorage/TmStorePackets.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tmstorage/TmStorePackets.h b/tmstorage/TmStorePackets.h index 4ce64fe64..0312a9989 100644 --- a/tmstorage/TmStorePackets.h +++ b/tmstorage/TmStorePackets.h @@ -49,7 +49,7 @@ public: } ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, - Endianness streamEndianness) { + Endianness streamEndianness) { ReturnValue_t result = SerializeAdapter::deSerialize(&apid, buffer, size, streamEndianness); if (result != HasReturnvaluesIF::RETURN_OK) { @@ -139,8 +139,9 @@ public: static bool isOlderThan(const TmPacketInformation* packet, const timeval* cmpTime){ if(packet->isValid()){ timeval packetTime = {0,0}; - uint32_t foundlen = 0; - CCSDSTime::convertFromCcsds(&packetTime,&packet->rawTimestamp[0],&foundlen,sizeof(rawTimestamp)); + size_t foundlen = 0; + CCSDSTime::convertFromCcsds(&packetTime,&packet->rawTimestamp[0], + &foundlen,sizeof(rawTimestamp)); if(packetTime <= *cmpTime){ return true; } @@ -151,8 +152,9 @@ public: static bool isNewerThan(const TmPacketInformation* packet, const timeval* cmpTime){ if(packet->isValid()){ timeval packetTime = {0,0}; - uint32_t foundlen = 0; - CCSDSTime::convertFromCcsds(&packetTime,&packet->rawTimestamp[0],&foundlen,sizeof(rawTimestamp)); + size_t foundlen = 0; + CCSDSTime::convertFromCcsds(&packetTime,&packet->rawTimestamp[0], + &foundlen,sizeof(rawTimestamp)); if(packetTime >= *cmpTime){ return true; } @@ -204,8 +206,9 @@ public: timeval getTime() const { timeval packetTime = {0,0}; - uint32_t foundlen = 0; - CCSDSTime::convertFromCcsds(&packetTime,&this->rawTimestamp[0],&foundlen,sizeof(rawTimestamp)); + size_t foundlen = 0; + CCSDSTime::convertFromCcsds(&packetTime, &this->rawTimestamp[0], + &foundlen, sizeof(rawTimestamp)); return packetTime; } @@ -258,7 +261,7 @@ public: }; ReturnValue_t deSerialize(const uint8_t** buffer, size_t* size, - Endianness streamEndianness) { + Endianness streamEndianness) { ReturnValue_t result = SerializeAdapter::deSerialize(&apid, buffer, size, streamEndianness); if (result != HasReturnvaluesIF::RETURN_OK) {