From 920ff15f7160cfa6ed8d8d81e0c156dd1d7b27c6 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sat, 5 May 2018 19:26:48 +0200 Subject: Planner: don't return static data in fake_dc() fake_dc() used to return a statically allocated dc with statically allocated samples. This is of course a questionable practice in the light of multi-threading / resource ownership. Once these problems were recognized, the parameter "alloc" was added. If set to true, the function would still return a statically allocated dc, but heap-allocated samples, which could then be copied in a different dc. All in all an ownership nightmare and a recipie for disaster. The returned static dc was only used as a pointer to the samples anyway. There are four callers of fake_dc() and they all have access to a dc-structure without samples. Therefore, change the semantics of fake_dc() to fill out the passed in dc. If the caller does not care about the samples, it can simply reset the sample number to zero after work. Signed-off-by: Berthold Stoeger --- qt-models/diveplannermodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qt-models') diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index 0745c362d..d65fa771f 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -99,7 +99,7 @@ void DivePlannerPointsModel::loadFromDive(dive *d) if (dc->samples) hasMarkedSamples = dc->sample[0].manually_entered; else - dc = fake_dc(dc, true); + fake_dc(dc); // if this dive has more than 100 samples (so it is probably a logged dive), // average samples so we end up with a total of 100 samples. -- cgit v1.2.3-70-g09d2