Extracting initialisation of MQTT OTA buffer and control data for binary OTA data into separate functions

Author: aentinger

src/utility/ota/OTALogic.cpp

@@ -39,13 +39,8 @@ OTALogic::OTALogic(OTAStorage & ota_storage)
 , _ota_state{OTAState::Init}
 , _ota_error{OTAError::None}
 {
-  memset(_mqtt_ota_buf.buf, 0U, sizeof(_mqtt_ota_buf.buf));
-  _mqtt_ota_buf.num_bytes = 0;
-
-  _ota_bin_data.hdr_len        = 0;
-  _ota_bin_data.hdr_crc32      = 0;
-  _ota_bin_data.bytes_received = 0;
-  _ota_bin_data.crc32          = crc_init();
+  init_mqtt_ota_buffer();
+  init_ota_binary_data();
 }
 
 /******************************************************************************
@@ -233,3 +228,17 @@ OTAState OTALogic::handle_Reset()
 #endif /* HOST */
   return OTAState::Reset;
 }
+
+void OTALogic::init_mqtt_ota_buffer()
+{
+  memset(_mqtt_ota_buf.buf, 0U, sizeof(_mqtt_ota_buf.buf));
+  _mqtt_ota_buf.num_bytes = 0;
+}
+
+void OTALogic::init_ota_binary_data()
+{
+  _ota_bin_data.hdr_len        = 0;
+  _ota_bin_data.hdr_crc32      = 0;
+  _ota_bin_data.bytes_received = 0;
+  _ota_bin_data.crc32          = crc_init();
+}

src/utility/ota/OTALogic.h

@@ -106,6 +106,9 @@ class OTALogic
   OTAState handle_Verify();
   OTAState handle_Reset();
 
+  void init_mqtt_ota_buffer();
+  void init_ota_binary_data();
+
 };
 
 #endif /* ARDUINO_OTA_LOGIC_H_ */