diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-04 16:21:47 +1100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-02-04 06:48:57 +1100 |
| commit | 618fcc8cbc64984b55e19b761788970d9fb4546e (patch) | |
| tree | c01bd299bca60b3adc357af9785b5bd9d7a69b83 /dive.c | |
| parent | f507b05927fccc228951c6aa06df1f2a4a01de0a (diff) | |
| download | subsurface-618fcc8cbc64984b55e19b761788970d9fb4546e.tar.gz | |
Fix dive computer interleaving so it works again
Merging two different dives by interleaving dive computer data got
broken by the multi-dive-computer code in commit b6c9301e5847 ("Move
more dive computer filled data to the divecomputer structure") which
added a lot more entries to the dive computer data structure, and then
copied the resulting structure incorrectly.
Make sure we don't copy the events and samples allocations when we copy
all the other fields of the divecomputer.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.c')
| -rw-r--r-- | dive.c | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -1397,6 +1397,17 @@ static struct divecomputer *find_matching_computer(struct divecomputer *match, s return p; } + +static void copy_dive_computer(struct divecomputer *res, struct divecomputer *a) +{ + *res = *a; + res->model = a->model ? strdup(a->model) : NULL; + res->samples = res->alloc_samples = 0; + res->sample = NULL; + res->events = NULL; + res->next = NULL; +} + /* * Join dive computers with a specific time offset between * them. @@ -1411,9 +1422,7 @@ static void interleave_dive_computers(struct divecomputer *res, do { struct divecomputer *match; - *res = *a; - res->model = a->model ? strdup(a->model) : NULL; - res->next = NULL; + copy_dive_computer(res, a); match = find_matching_computer(a, b); if (match) { |