MessageDecoder: rewrite copyCBORStringToArray and copyCBORByteToArray

Author: pennam

src/cbor/MessageDecoder.cpp

@@ -69,32 +69,27 @@ Decoder::Status CBORMessageDecoder::decode(Message * message, uint8_t const * co
  ******************************************************************************/
 
 bool copyCBORStringToArray(CborValue * param, char * dest, size_t dest_size) {
-  if (!cbor_value_is_text_string(param)) {
-    return false;
-  }
-
-  // NOTE: keep in mind that _cbor_value_copy_string tries to put a \0 at the end of the string
-  if(_cbor_value_copy_string(param, dest, &dest_size, NULL) != CborNoError) {
-    return false;
+  if (cbor_value_is_text_string(param)) {
+    // NOTE: keep in mind that _cbor_value_copy_string tries to put a \0 at the end of the string
+    if(_cbor_value_copy_string(param, dest, &dest_size, NULL) == CborNoError) {
+      return true;
+    }
   }
 
-  return true;
+  return false;
 }
 
 // FIXME dest_size should be also returned, the copied byte array can have a different size from the starting one
 // for the time being we need this on SHA256 only
 bool copyCBORByteToArray(CborValue * param, uint8_t * dest, size_t dest_size) {
-  if (!cbor_value_is_byte_string(param)) {
-    return false;
-  }
-
-  // NOTE: keep in mind that _cbor_value_copy_string tries to put a \0 at the end of the string
-  if(_cbor_value_copy_string(param, dest, &dest_size, NULL) != CborNoError) {
-
-    return false;
+  if (cbor_value_is_byte_string(param)) {
+    // NOTE: keep in mind that _cbor_value_copy_string tries to put a \0 at the end of the string
+    if(_cbor_value_copy_string(param, dest, &dest_size, NULL) == CborNoError) {
+      return true;
+    }
   }
 
-  return true;
+  return false;
 }
 
 CBORMessageDecoder::ArrayParserState CBORMessageDecoder::handle_EnterArray(CborValue * main_iter, CborValue * array_iter) {