[TMP] flash memory savings

Author: andreagilardoni

src/cbor/CborDecoder.cpp

@@ -32,11 +32,9 @@ Decoder::Status CBORMessageDecoderClass::decode(Message* msg, const uint8_t* con
   }
 
   // encode the message
-  if(decoder_it->second->_decode(&iter, msg) == Decoder::Status::Error) {
-    return Decoder::Status::Error;
-  }
+  CBORMessageDecoderInterface* decoder = (CBORMessageDecoderInterface*) decoder_it->second;
 
-  return Decoder::Status::Complete;
+  return decoder->_decode(&iter, msg);
 }
 
 CBORMessageDecoderInterface::CBORMessageDecoderInterface(const CBORTag tag, const MessageId id)

src/cbor/CborDecoder.h

@@ -48,7 +48,7 @@ class CBORMessageDecoderClass: public Decoder {
 
   Decoder::Status decode(Message* msg, const uint8_t* const buf, size_t &len);
 private:
-  std::map<CBORTag, CBORMessageDecoderInterface*> decoders;
+  std::map<CBORTag, void*> decoders;
 };
 
 extern CBORMessageDecoderClass& CBORMessageDecoder;

src/cbor/CborEncoder.cpp

@@ -16,7 +16,8 @@ Encoder::Status CBORMessageEncoderClass::encode(Message* message, uint8_t * data
   }
 
   // encode the message
-  if(encoder_it->second->_encode(&encoder, message) == Encoder::Status::Error) {
+  CBORMessageEncoderInterface* encoder_ptr = (CBORMessageEncoderInterface*) encoder_it->second;
+  if(encoder_ptr->_encode(&encoder, message) == Encoder::Status::Error) {
     return Encoder::Status::Error;
   }
 

src/cbor/CborEncoder.h

@@ -48,7 +48,7 @@ class CBORMessageEncoderClass: public Encoder {
 
   Encoder::Status encode(Message* message, uint8_t * data, size_t& len);
 private:
-  std::map<MessageId, CBORMessageEncoderInterface*> encoders;
+  std::map<MessageId, void*> encoders;
 };
 
 extern CBORMessageEncoderClass& CBORMessageEncoder;