summaryrefslogtreecommitdiffstats
path: root/subsurface-core/device.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2016-02-20 09:36:14 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-02-20 09:36:14 -0800
commit38ab11a6c0299fb55944bdb1438d9ac357682d4d (patch)
treedbcc5d6485ea45565a2d10acdd771230eb48414e /subsurface-core/device.c
parent0b0e56edebc849818b7a76b1c4e809f357394e04 (diff)
downloadsubsurface-38ab11a6c0299fb55944bdb1438d9ac357682d4d.tar.gz
Add option to allocate the samples in fake_dc()
We (ab)use fake_dc() to create a pleasing profile for a manually added dive. Based on it's intended use, fake_dc() simply handed back a dc structure that pointed at staticly allocated samples - that's obviously (now that I think about it) going to blow up in my face if I edit a manually added dive more than once. So now we have an option for fake_dc() to actually allocate the samples - this way the rest of the code can treat these samples as we would treat samples created any other way. We can free them and replace them with a new set. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-core/device.c')
-rw-r--r--subsurface-core/device.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/subsurface-core/device.c b/subsurface-core/device.c
index bc1a2f681..6c4452f78 100644
--- a/subsurface-core/device.c
+++ b/subsurface-core/device.c
@@ -108,12 +108,16 @@ static void fill_samples_no_avg(struct sample *s, int max_d, int max_t, double s
}
}
-struct divecomputer *fake_dc(struct divecomputer *dc)
+struct divecomputer *fake_dc(struct divecomputer *dc, bool alloc)
{
- static struct sample fake[6];
+ static struct sample fake_samples[6];
static struct divecomputer fakedc;
+ struct sample *fake = fake_samples;
fakedc = (*dc);
+ if (alloc)
+ fake = malloc(sizeof(fake_samples));
+
fakedc.sample = fake;
fakedc.samples = 6;
@@ -122,7 +126,7 @@ struct divecomputer *fake_dc(struct divecomputer *dc)
int max_d = dc->maxdepth.mm;
int avg_d = dc->meandepth.mm;
- memset(fake, 0, sizeof(fake));
+ memset(fake, 0, sizeof(fake_samples));
fake[5].time.seconds = max_t;
if (!max_t || !max_d)
return &fakedc;