fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

getter/setter functions for serial buffer adapter #170

Merged
gaisser merged 10 commits from KSat/fsfw:mueller/SerialBufferAdapter into master 2020-08-25 13:51:30 +02:00
Conversation 0 Commits 10 Files Changed 2 +4 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 26b63d63b9 - Show all commits

7
serialize/SerialBufferAdapter.cpp
View File

@ -30,15 +30,16 @@ ReturnValue_t SerialBufferAdapter<T>::serialize(uint8_t** buffer, size_t* size,
}
if (*size + serializedLength > maxSize) {
return BUFFER_TOO_SHORT;
} else {
}
else {
if (serializeLength) {
SerializeAdapter::serialize(&bufferLength, buffer, size,
maxSize, streamEndianness);
}
if (constBuffer != nullptr) {
if (this->constBuffer != nullptr) {
memcpy(*buffer, this->constBuffer, bufferLength);
}
else if (buffer != nullptr) {
else if (this->buffer != nullptr) {
// This will propably be never reached, constBuffer should always be
// set if non-const buffer is set.
memcpy(*buffer, this->buffer, bufferLength);