Added missing override keyword

Signed-off-by: Cervenka Dusan <[email protected]>

Author: Hadatko

erpc_c/infra/erpc_basic_codec.cpp

@@ -27,6 +27,13 @@ using namespace erpc;
 
 const uint32_t BasicCodec::kBasicCodecVersion = 1UL;
 
+BasicCodec::BasicCodec(void)
+: Codec()
+{
+}
+
+BasicCodec::~BasicCodec(void) {}
+
 void BasicCodec::startWriteMessage(message_type_t type, uint32_t service, uint32_t request, uint32_t sequence)
 {
     uint32_t header =
@@ -367,6 +374,13 @@ void BasicCodec::readNullFlag(bool &isNull)
 
 ERPC_MANUALLY_CONSTRUCTED_ARRAY_STATIC(BasicCodec, s_basicCodecManual, ERPC_CODEC_COUNT);
 
+BasicCodecFactory::BasicCodecFactory(void)
+: CodecFactory()
+{
+}
+
+BasicCodecFactory::~BasicCodecFactory(void) {}
+
 Codec *BasicCodecFactory::create(void)
 {
     ERPC_CREATE_NEW_OBJECT(BasicCodec, s_basicCodecManual, ERPC_CODEC_COUNT)

erpc_c/infra/erpc_basic_codec.hpp

@@ -43,10 +43,15 @@ class BasicCodec : public Codec
 public:
     static const uint32_t kBasicCodecVersion; /*!< Codec version. */
 
-    BasicCodec(void)
-    : Codec()
-    {
-    }
+    /*!
+     * @brief Constructor.
+     */
+    BasicCodec(void);
+
+    /*!
+     * @brief CodecFactory destructor
+     */
+    virtual ~BasicCodec(void);
 
     //! @name Encoding
     //@{
@@ -344,6 +349,16 @@ class BasicCodec : public Codec
 class BasicCodecFactory : public CodecFactory
 {
 public:
+    /*!
+     * @brief Constructor.
+     */
+    BasicCodecFactory(void);
+
+    /*!
+     * @brief CodecFactory destructor
+     */
+    virtual ~BasicCodecFactory(void);
+
     /*!
      * @brief Return created codec.
      *

erpc_c/infra/erpc_message_buffer.cpp

@@ -239,6 +239,10 @@ erpc_status_t Cursor::write(const void *data, uint32_t length)
     return err;
 }
 
+MessageBufferFactory::MessageBufferFactory(void) {}
+
+MessageBufferFactory::~MessageBufferFactory(void) {}
+
 MessageBuffer MessageBufferFactory::create(uint8_t reserveHeaderSize)
 {
     MessageBuffer messageBuffer = create();
@@ -248,6 +252,11 @@ MessageBuffer MessageBufferFactory::create(uint8_t reserveHeaderSize)
     return messageBuffer;
 }
 
+bool MessageBufferFactory::createServerBuffer(void)
+{
+    return true;
+}
+
 erpc_status_t MessageBufferFactory::prepareServerBufferForSend(MessageBuffer &message, uint8_t reserveHeaderSize)
 {
     message.setUsed(reserveHeaderSize);

erpc_c/infra/erpc_message_buffer.hpp

@@ -367,12 +367,12 @@ class MessageBufferFactory
      *
      * This function initializes object attributes.
      */
-    MessageBufferFactory(void) {}
+    MessageBufferFactory(void);
 
     /*!
      * @brief MessageBufferFactory destructor
      */
-    virtual ~MessageBufferFactory(void) {}
+    virtual ~MessageBufferFactory(void);
 
     /*!
      * @brief This function creates new message buffer.
@@ -397,7 +397,7 @@ class MessageBufferFactory
      *
      * @return Has to return TRUE when server need create buffer for receiving message.
      */
-    virtual bool createServerBuffer(void) { return true; }
+    virtual bool createServerBuffer(void);
 
     /*!
      * @brief This function is preparing output buffer on server side.

erpc_c/infra/erpc_message_loggers.hpp

@@ -86,7 +86,7 @@ class MessageLoggers
     /*!
      * @brief Transport destructor
      */
-    virtual ~MessageLoggers(void);
+    ~MessageLoggers(void);
 
     /*!
      * @brief This function add given transport to newly created MessageLogger object.

erpc_c/infra/erpc_simple_server.cpp

@@ -15,17 +15,49 @@ using namespace erpc;
 ////////////////////////////////////////////////////////////////////////////////
 // Code
 ////////////////////////////////////////////////////////////////////////////////
+SimpleServer::SimpleServer(void)
+: m_isServerOn(true)
+{
+}
 
-void SimpleServer::disposeBufferAndCodec(Codec *codec)
+SimpleServer::~SimpleServer(void) {}
+
+erpc_status_t SimpleServer::run(void)
 {
-    if (codec != NULL)
+    erpc_status_t err = kErpcStatus_Success;
+    while ((err == kErpcStatus_Success) && m_isServerOn)
     {
-        if (codec->getBuffer() != NULL)
+        err = runInternal();
+    }
+    return err;
+}
+
+erpc_status_t SimpleServer::poll(void)
+{
+    erpc_status_t err;
+
+    if (m_isServerOn)
+    {
+        if (m_transport->hasMessage() == true)
         {
-            m_messageFactory->dispose(&codec->getBufferRef());
+            err = runInternal();
+        }
+        else
+        {
+            err = kErpcStatus_Success;
         }
-        m_codecFactory->dispose(codec);
     }
+    else
+    {
+        err = kErpcStatus_ServerIsDown;
+    }
+
+    return err;
+}
+
+void SimpleServer::stop(void)
+{
+    m_isServerOn = false;
 }
 
 erpc_status_t SimpleServer::runInternal(void)
@@ -151,16 +183,6 @@ erpc_status_t SimpleServer::runInternalEnd(Codec *codec, message_type_t msgType,
     return err;
 }
 
-erpc_status_t SimpleServer::run(void)
-{
-    erpc_status_t err = kErpcStatus_Success;
-    while ((err == kErpcStatus_Success) && m_isServerOn)
-    {
-        err = runInternal();
-    }
-    return err;
-}
-
 #if ERPC_NESTED_CALLS
 erpc_status_t SimpleServer::run(RequestContext &request)
 {
@@ -212,30 +234,14 @@ erpc_status_t SimpleServer::run(RequestContext &request)
 }
 #endif
 
-erpc_status_t SimpleServer::poll(void)
+void SimpleServer::disposeBufferAndCodec(Codec *codec)
 {
-    erpc_status_t err;
-
-    if (m_isServerOn)
+    if (codec != NULL)
     {
-        if (m_transport->hasMessage() == true)
-        {
-            err = runInternal();
-        }
-        else
+        if (codec->getBuffer() != NULL)
         {
-            err = kErpcStatus_Success;
+            m_messageFactory->dispose(&codec->getBufferRef());
         }
+        m_codecFactory->dispose(codec);
     }
-    else
-    {
-        err = kErpcStatus_ServerIsDown;
-    }
-
-    return err;
-}
-
-void SimpleServer::stop(void)
-{
-    m_isServerOn = false;
 }

erpc_c/infra/erpc_simple_server.hpp

@@ -37,10 +37,9 @@ class SimpleServer : public Server
      *
      * This function initializes object attributes.
      */
-    SimpleServer(void)
-    : m_isServerOn(true)
-    {
-    }
+    SimpleServer(void);
+
+    virtual ~SimpleServer(void);
 
     /*!
      * @brief Run server in infinite loop.
@@ -66,6 +65,16 @@ class SimpleServer : public Server
     virtual void stop(void) override;
 
 protected:
+    bool m_isServerOn; /*!< Information if server is ON or OFF. */
+
+    /*!
+     * @brief Run server implementation.
+     *
+     * This function call functions for receiving data, process this data and
+     * if reply exist, send it back.
+     */
+    erpc_status_t runInternal(void);
+
     /*!
      * @brief This function handle receiving request message and reading base info about message.
      *
@@ -104,22 +113,12 @@ class SimpleServer : public Server
     virtual erpc_status_t run(RequestContext &request) override;
 #endif
 
-    /*!
-     * @brief Run server implementation.
-     *
-     * This function call functions for receiving data, process this data and
-     * if reply exist, send it back.
-     */
-    erpc_status_t runInternal(void);
-
     /*!
      * @brief Disposing message buffers and codecs.
      *
      * @param[in] codec Pointer to codec to dispose. It contains also message buffer to dispose.
      */
     void disposeBufferAndCodec(Codec *codec);
-
-    bool m_isServerOn; /*!< Information if server is ON or OFF. */
 };
 
 } // namespace erpc

erpc_c/infra/erpc_transport.hpp

@@ -113,10 +113,12 @@ class TransportFactory
      * @brief Constructor.
      */
     TransportFactory(void) {}
+
     /*!
      * @brief TransportFactory destructor
      */
     virtual ~TransportFactory(void) {}
+
     /*!
      * @brief Return created transport object.
      *

erpc_c/infra/erpc_transport_arbitrator.cpp

@@ -44,24 +44,9 @@ TransportArbitrator::~TransportArbitrator(void)
     freeClientList(m_clientFreeList);
 }
 
-void TransportArbitrator::setCrc16(Crc16 *crcImpl)
+uint8_t TransportArbitrator::reserveHeaderSize(void)
 {
-    erpc_assert(crcImpl != NULL);
-    erpc_assert(m_sharedTransport != NULL);
-    m_sharedTransport->setCrc16(crcImpl);
-}
-
-Crc16 *TransportArbitrator::getCrc16(void)
-{
-    erpc_assert(m_sharedTransport != NULL);
-    return m_sharedTransport->getCrc16();
-}
-
-bool TransportArbitrator::hasMessage(void)
-{
-    erpc_assert((m_sharedTransport != NULL) && ("shared transport is not set" != NULL));
-
-    return m_sharedTransport->hasMessage();
+    return m_sharedTransport->reserveHeaderSize();
 }
 
 erpc_status_t TransportArbitrator::receive(MessageBuffer *message)
@@ -151,6 +136,46 @@ erpc_status_t TransportArbitrator::send(MessageBuffer *message)
     return m_sharedTransport->send(message);
 }
 
+bool TransportArbitrator::hasMessage(void)
+{
+    erpc_assert((m_sharedTransport != NULL) && ("shared transport is not set" != NULL));
+
+    return m_sharedTransport->hasMessage();
+}
+
+void TransportArbitrator::setCrc16(Crc16 *crcImpl)
+{
+    erpc_assert(crcImpl != NULL);
+    erpc_assert(m_sharedTransport != NULL);
+    m_sharedTransport->setCrc16(crcImpl);
+}
+
+Crc16 *TransportArbitrator::getCrc16(void)
+{
+    erpc_assert(m_sharedTransport != NULL);
+    return m_sharedTransport->getCrc16();
+}
+
+void TransportArbitrator::setSharedTransport(Transport *shared)
+{
+    m_sharedTransport = shared;
+}
+
+Transport *TransportArbitrator::getSharedTransport(void)
+{
+    return m_sharedTransport;
+}
+
+void TransportArbitrator::setCodec(Codec *codec)
+{
+    m_codec = codec;
+}
+
+Codec *TransportArbitrator::getCodec(void)
+{
+    return m_codec;
+}
+
 TransportArbitrator::client_token_t TransportArbitrator::prepareClientReceive(RequestContext &request)
 {
     PendingClientInfo *info = addPendingClient();