MessageEncoder: rewrite handle_EncodeParam and handle_CloseArray

Author: pennam

src/cbor/MessageEncoder.cpp

@@ -132,21 +132,14 @@ CBORMessageEncoder::EncoderState CBORMessageEncoder::handle_EncodeParam(CborEnco
     return EncoderState::MessageNotSupported;
   }
 
-  if (error != CborNoError) {
-    return EncoderState::Error;
-  }
-
-  return EncoderState::CloseArray;
+  return (error != CborNoError) ? EncoderState::Error : EncoderState::CloseArray;
 }
 
 CBORMessageEncoder::EncoderState CBORMessageEncoder::handle_CloseArray(CborEncoder * encoder, CborEncoder * array_encoder)
 {
+  CborError error = cbor_encoder_close_container(encoder, array_encoder);
 
-  if (cbor_encoder_close_container(encoder, array_encoder) != CborNoError) {
-    return EncoderState::Error;
-  }
-
-  return EncoderState::Complete;
+  return (error != CborNoError) ? EncoderState::Error : EncoderState::Complete;
 }
 
 // Message specific encoders