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 --- profile-widget/profilewidget2.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'profile-widget') diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 78bd294d4..fa0e98cea 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -592,9 +592,8 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) // data that we have struct divecomputer *currentdc = select_dc(&displayed_dive); Q_ASSERT(currentdc); - if (!currentdc || !currentdc->samples) { - currentdc = fake_dc(currentdc, false); - } + if (!currentdc || !currentdc->samples) + fake_dc(currentdc); bool setpointflag = (currentdc->divemode == CCR) && prefs.pp_graphs.po2 && current_dive; bool sensorflag = setpointflag && prefs.show_ccr_sensors; -- cgit v1.2.3-70-g09d2