From c9d8bd59f0120dca352352dab737d39c43896131 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Mon, 15 Jun 2020 11:11:42 +0200 Subject: [PATCH] ctor improved --- ipc/CommandMessage.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/ipc/CommandMessage.cpp b/ipc/CommandMessage.cpp index 64d4d41c..163a6a2d 100644 --- a/ipc/CommandMessage.cpp +++ b/ipc/CommandMessage.cpp @@ -10,31 +10,18 @@ CommandMessage::CommandMessage(MessageQueueMessageIF* receiverMessage): return; } if(receiverMessage->getMaximumMessageSize() < - MINIMUM_COMMAND_MESSAGE_SIZE) { + getMinimumMessageSize()) { sif::error << "CommandMessage::ComandMessage: Passed message buffer" " can not hold minimum "<< MINIMUM_COMMAND_MESSAGE_SIZE << " bytes!" << std::endl; return; } - internalMessage->setMessageSize(MINIMUM_COMMAND_MESSAGE_SIZE); + internalMessage->setMessageSize(getMinimumMessageSize()); } CommandMessage::CommandMessage(MessageQueueMessageIF* messageToSet, Command_t command, uint32_t parameter1, uint32_t parameter2): - CommandMessageBase(messageToSet) { - if(messageToSet == nullptr) { - sif::error << "CommandMessage::CommandMessage: Don't pass a nullptr" - " as the message queue message, pass the address of an actual" - " message!" << std::endl; - } - if(messageToSet->getMaximumMessageSize() < - MINIMUM_COMMAND_MESSAGE_SIZE) { - sif::error << "CommandMessage::ComandMessage: Passed message buffer" - " can not hold minimum "<< MINIMUM_COMMAND_MESSAGE_SIZE - << " bytes!" << std::endl; - return; - } - internalMessage->setMessageSize(MINIMUM_COMMAND_MESSAGE_SIZE); + CommandMessage(messageToSet) { setCommand(command); setParameter(parameter1); setParameter2(parameter2);