From 2b3d2f1020dce0a6ef99aaae40fb4234368c5483 Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Wed, 29 May 2024 18:01:26 +0200
Subject: [PATCH] core: add default initialization to sruct deco_state

Don't memset() to clear deco_state, use assignment of
default constructed object (or better yet: just default
construct).

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
---
 core/deco.cpp                  |  2 +-
 core/deco.h                    | 48 +++++++++++++++++-----------------
 qt-models/diveplannermodel.cpp |  1 -
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/core/deco.cpp b/core/deco.cpp
index 6abdb5502..bd06d539a 100644
--- a/core/deco.cpp
+++ b/core/deco.cpp
@@ -503,7 +503,7 @@ void clear_deco(struct deco_state *ds, double surface_pressure, bool in_planner)
 {
 	int ci;
 
-	memset(ds, 0, sizeof(*ds));
+	*ds = deco_state();
 	clear_vpmb_state(ds);
 	for (ci = 0; ci < 16; ci++) {
 		ds->tissue_n2_sat[ci] = (surface_pressure - ((in_planner && (decoMode(true) == VPMB)) ? WV_PRESSURE_SCHREINER : WV_PRESSURE)) * N2_IN_AIR / 1000;
diff --git a/core/deco.h b/core/deco.h
index 479f81cb1..30427b5d8 100644
--- a/core/deco.h
+++ b/core/deco.h
@@ -12,36 +12,36 @@ struct divecomputer;
 struct decostop;
 
 struct deco_state {
-	double tissue_n2_sat[16];
-	double tissue_he_sat[16];
-	double tolerated_by_tissue[16];
-	double tissue_inertgas_saturation[16];
-	double buehlmann_inertgas_a[16];
-	double buehlmann_inertgas_b[16];
+	double tissue_n2_sat[16] = {};
+	double tissue_he_sat[16] = {};
+	double tolerated_by_tissue[16] = {};
+	double tissue_inertgas_saturation[16] = {};
+	double buehlmann_inertgas_a[16] = {};
+	double buehlmann_inertgas_b[16] = {};
 
-	double max_n2_crushing_pressure[16];
-	double max_he_crushing_pressure[16];
+	double max_n2_crushing_pressure[16] = {};
+	double max_he_crushing_pressure[16] = {};
 
-	double crushing_onset_tension[16];            // total inert gas tension in the t* moment
-	double n2_regen_radius[16];                   // rs
-	double he_regen_radius[16];
-	double max_ambient_pressure;                  // last moment we were descending
+	double crushing_onset_tension[16] = {};       // total inert gas tension in the t* moment
+	double n2_regen_radius[16] = {};              // rs
+	double he_regen_radius[16] = {};
+	double max_ambient_pressure = 0.0;           // last moment we were descending
 
-	double bottom_n2_gradient[16];
-	double bottom_he_gradient[16];
+	double bottom_n2_gradient[16] = {};
+	double bottom_he_gradient[16] = {};
 
-	double initial_n2_gradient[16];
-	double initial_he_gradient[16];
+	double initial_n2_gradient[16] = {};
+	double initial_he_gradient[16] = {};
 	pressure_t first_ceiling_pressure;
 	pressure_t max_bottom_ceiling_pressure;
-	int ci_pointing_to_guiding_tissue;
-	double gf_low_pressure_this_dive;
-	int deco_time;
-	bool icd_warning;
-	int  sum1;
-	long sumx, sumxx;
-	double sumy, sumxy;
-	int plot_depth;
+	int ci_pointing_to_guiding_tissue = 0;
+	double gf_low_pressure_this_dive = 0.0;
+	int deco_time = 0;
+	bool icd_warning = false;
+	int  sum1 = 0;
+	long sumx = 0, sumxx = 0;
+	double sumy = 0, sumxy = 0;
+	int plot_depth = 0;
 };
 
 extern const double buehlmann_N2_t_halflife[];
diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index 69996cc4f..00a310438 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -1071,7 +1071,6 @@ void DivePlannerPointsModel::updateDiveProfile()
 	struct decostop stoptable[60];
 	struct deco_state plan_deco_state;
 
-	memset(&plan_deco_state, 0, sizeof(struct deco_state));
 	plan(&plan_deco_state, &diveplan, d, dcNr, decotimestep, stoptable, cache, isPlanner(), false);
 	updateMaxDepth();