Skip to content

Commit 264281f

Browse files
brentrubrentru
committed
Fix dtors, use memeset() to clear struct memory just like we did in ctors
1 parent 3a3cc81 commit 264281f

File tree

7 files changed

+59
-32
lines changed

7 files changed

+59
-32
lines changed

‎src/components/analogIO/model.cpp‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@
2020
*/
2121
/***********************************************************************/
2222
AnalogIOModel::AnalogIOModel()
23-
: _msg_AnalogioAdd(wippersnapper_analogio_AnalogIOAdd_init_default)
2423
{
24+
memset(&_msg_AnalogioAdd, 0, sizeof(_msg_AnalogioAdd));
25+
memset(&_msg_AnalogioRemove, 0, sizeof(_msg_AnalogioRemove));
26+
memset(&_msg_AnalogioEvent, 0, sizeof(_msg_AnalogioEvent));
2527
// no-op
2628
}
2729

@@ -30,7 +32,11 @@ AnalogIOModel::AnalogIOModel()
3032
@brief AnalogIOModel destructor
3133
*/
3234
/***********************************************************************/
33-
AnalogIOModel::~AnalogIOModel() {}
35+
AnalogIOModel::~AnalogIOModel() {
36+
memset(&_msg_AnalogioAdd, 0, sizeof(_msg_AnalogioAdd));
37+
memset(&_msg_AnalogioRemove, 0, sizeof(_msg_AnalogioRemove));
38+
memset(&_msg_AnalogioEvent, 0, sizeof(_msg_AnalogioEvent));
39+
}
3440

3541
/***********************************************************************/
3642
/*!

‎src/components/checkin/model.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
*/
2121
/***********************************************************************/
2222
CheckinModel::CheckinModel()
23-
: _CheckinRequest(wippersnapper_checkin_CheckinRequest_init_default),
24-
_CheckinResponse(wippersnapper_checkin_CheckinResponse_init_default)
2523
{
24+
memset(&_CheckinRequest, 0, sizeof(_CheckinRequest));
25+
memset(&_CheckinResponse, 0, sizeof(_CheckinResponse));
2626
// no-op
2727
}
2828

@@ -32,8 +32,8 @@ CheckinModel::CheckinModel()
3232
*/
3333
/***********************************************************************/
3434
CheckinModel::~CheckinModel() {
35-
_CheckinRequest = wippersnapper_checkin_CheckinRequest_init_default;
36-
_CheckinResponse = wippersnapper_checkin_CheckinResponse_init_default;
35+
memset(&_CheckinRequest, 0, sizeof(_CheckinRequest));
36+
memset(&_CheckinResponse, 0, sizeof(_CheckinResponse));
3737
}
3838

3939
/***********************************************************************/

‎src/components/digitalIO/model.cpp‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
*/
2121
/***********************************************************************/
2222
DigitalIOModel::DigitalIOModel()
23-
: _msg_dio_add(wippersnapper_digitalio_DigitalIOAdd_init_default),
24-
_msg_dio_remove(wippersnapper_digitalio_DigitalIORemove_init_default),
25-
_msg_dio_event(wippersnapper_digitalio_DigitalIOEvent_init_default),
26-
_msg_dio_write(wippersnapper_digitalio_DigitalIOWrite_init_default)
2723
{
24+
memset(&_msg_dio_add, 0, sizeof(_msg_dio_add));
25+
memset(&_msg_dio_remove, 0, sizeof(_msg_dio_remove));
26+
memset(&_msg_dio_event, 0, sizeof(_msg_dio_event));
27+
memset(&_msg_dio_write, 0, sizeof(_msg_dio_write));
2828
// no-op
2929
}
3030

@@ -33,7 +33,12 @@ DigitalIOModel::DigitalIOModel()
3333
@brief DigitalIOModel destructor
3434
*/
3535
/***********************************************************************/
36-
DigitalIOModel::~DigitalIOModel() {}
36+
DigitalIOModel::~DigitalIOModel() {
37+
memset(&_msg_dio_add, 0, sizeof(_msg_dio_add));
38+
memset(&_msg_dio_remove, 0, sizeof(_msg_dio_remove));
39+
memset(&_msg_dio_event, 0, sizeof(_msg_dio_event));
40+
memset(&_msg_dio_write, 0, sizeof(_msg_dio_write));
41+
}
3742

3843
/***********************************************************************/
3944
/*!

‎src/components/ds18x20/model.cpp‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,25 @@
2020
*/
2121
/***********************************************************************/
2222
DS18X20Model::DS18X20Model()
23-
: _msg_DS18x20Add(wippersnapper_ds18x20_Ds18x20Add_init_zero),
24-
_msg_DS18x20Added(wippersnapper_ds18x20_Ds18x20Added_init_zero),
25-
_msg_DS18x20Remove(wippersnapper_ds18x20_Ds18x20Remove_init_zero),
26-
_msg_DS18x20Event(wippersnapper_ds18x20_Ds18x20Event_init_zero)
2723
{
28-
// no-op
24+
memset(&_msg_DS18x20Add, 0, sizeof(_msg_DS18x20Add));
25+
memset(&_msg_DS18x20Added, 0, sizeof(_msg_DS18x20Added));
26+
memset(&_msg_DS18x20Remove, 0, sizeof(_msg_DS18x20Remove));
27+
memset(&_msg_DS18x20Event, 0, sizeof(_msg_DS18x20Event));
28+
// no-op
2929
}
3030

3131
/***********************************************************************/
3232
/*!
3333
@brief DS18X20Model destructor
3434
*/
3535
/***********************************************************************/
36-
DS18X20Model::~DS18X20Model() {}
36+
DS18X20Model::~DS18X20Model() {
37+
memset(&_msg_DS18x20Add, 0, sizeof(_msg_DS18x20Add));
38+
memset(&_msg_DS18x20Added, 0, sizeof(_msg_DS18x20Added));
39+
memset(&_msg_DS18x20Remove, 0, sizeof(_msg_DS18x20Remove));
40+
memset(&_msg_DS18x20Event, 0, sizeof(_msg_DS18x20Event));
41+
}
3742

3843
/***********************************************************************/
3944
/*!

‎src/components/i2c/model.cpp‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
*/
2121
/***********************************************************************/
2222
I2cModel::I2cModel()
23-
: _msg_i2c_bus_scan(wippersnapper_i2c_I2cBusScan_init_default),
24-
_msg_i2c_bus_scanned(wippersnapper_i2c_I2cBusScanned_init_default),
25-
_msg_i2c_device_add_replace(wippersnapper_i2c_I2cDeviceAddOrReplace_init_default),
26-
_msg_i2c_device_added_replaced(wippersnapper_i2c_I2cDeviceAddedOrReplaced_init_default),
27-
_msg_i2c_device_remove(wippersnapper_i2c_I2cDeviceRemove_init_default),
28-
_msg_i2c_device_removed(wippersnapper_i2c_I2cDeviceRemoved_init_default),
29-
_msg_i2c_device_event(wippersnapper_i2c_I2cDeviceEvent_init_default)
3023
{
24+
memset(&_msg_i2c_bus_scan, 0, sizeof(_msg_i2c_bus_scan));
25+
memset(&_msg_i2c_bus_scanned, 0, sizeof(_msg_i2c_bus_scanned));
26+
memset(&_msg_i2c_device_add_replace, 0, sizeof(_msg_i2c_device_add_replace));
27+
memset(&_msg_i2c_device_added_replaced, 0, sizeof(_msg_i2c_device_added_replaced));
28+
memset(&_msg_i2c_device_remove, 0, sizeof(_msg_i2c_device_remove));
29+
memset(&_msg_i2c_device_removed, 0, sizeof(_msg_i2c_device_removed));
30+
memset(&_msg_i2c_device_event, 0, sizeof(_msg_i2c_device_event));
3131
// no-op
3232
}
3333

@@ -37,7 +37,13 @@ I2cModel::I2cModel()
3737
*/
3838
/***********************************************************************/
3939
I2cModel::~I2cModel() {
40-
// nothing to add here!
40+
memset(&_msg_i2c_bus_scan, 0, sizeof(_msg_i2c_bus_scan));
41+
memset(&_msg_i2c_bus_scanned, 0, sizeof(_msg_i2c_bus_scanned));
42+
memset(&_msg_i2c_device_add_replace, 0, sizeof(_msg_i2c_device_add_replace));
43+
memset(&_msg_i2c_device_added_replaced, 0, sizeof(_msg_i2c_device_added_replaced));
44+
memset(&_msg_i2c_device_remove, 0, sizeof(_msg_i2c_device_remove));
45+
memset(&_msg_i2c_device_removed, 0, sizeof(_msg_i2c_device_removed));
46+
memset(&_msg_i2c_device_event, 0, sizeof(_msg_i2c_device_event));
4147
}
4248

4349
/***************************************************************************/

‎src/components/pixels/model.cpp‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
*/
2323
/**************************************************************************/
2424
PixelsModel::PixelsModel()
25-
: _msg_pixels_add(wippersnapper_pixels_PixelsAdd_init_zero),
26-
_msg_pixels_remove(wippersnapper_pixels_PixelsRemove_init_zero),
27-
_msg_pixels_write(wippersnapper_pixels_PixelsWrite_init_zero),
28-
_msg_pixels_added(wippersnapper_pixels_PixelsAdded_init_zero)
2925
{
26+
memset(&_msg_pixels_add, 0, sizeof(_msg_pixels_add));
27+
memset(&_msg_pixels_remove, 0, sizeof(_msg_pixels_remove));
28+
memset(&_msg_pixels_write, 0, sizeof(_msg_pixels_write));
29+
memset(&_msg_pixels_added, 0, sizeof(_msg_pixels_added));
3030
// no-op
3131
}
3232

@@ -35,7 +35,12 @@ PixelsModel::PixelsModel()
3535
@brief Destructs a PixelsModel object
3636
*/
3737
/**************************************************************************/
38-
PixelsModel::~PixelsModel() {}
38+
PixelsModel::~PixelsModel() {
39+
memset(&_msg_pixels_add, 0, sizeof(_msg_pixels_add));
40+
memset(&_msg_pixels_remove, 0, sizeof(_msg_pixels_remove));
41+
memset(&_msg_pixels_write, 0, sizeof(_msg_pixels_write));
42+
memset(&_msg_pixels_added, 0, sizeof(_msg_pixels_added));
43+
}
3944

4045
/**************************************************************************/
4146
/*!

‎src/components/sensor/model.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
*/
2121
/***********************************************************************/
2222
SensorModel::SensorModel()
23-
: _msg_sensor_event(wippersnapper_sensor_SensorEvent_init_zero)
2423
{
24+
memset(&_msg_sensor_event, 0, sizeof(_msg_sensor_event));
2525
// no-op
2626
}
2727

@@ -32,5 +32,5 @@ SensorModel::SensorModel()
3232
/***********************************************************************/
3333
SensorModel::~SensorModel() {
3434
// Zero-out the SensorEvent message
35-
_msg_sensor_event = wippersnapper_sensor_SensorEvent_init_zero;
35+
memset(&_msg_sensor_event, 0, sizeof(_msg_sensor_event));
3636
}

0 commit comments

Comments
 (0)