mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Helper function to determined planned dives

Browse source 
... to reduce code duplication.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
This commit is contained in:
Robert C. Helling 2019-01-01 18:02:04 +01:00
parent f1fc89b978
commit c349692d98
4 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/dive.c
View file

@ -3357,6 +3357,10 @@ void dump_taglist(const char *intro, struct tag_entry *tl)
fprintf(stderr, "\n");
}
bool is_dc_planner(const struct divecomputer *dc) {
return same_string(dc->model, "planned dive");
}
/*
* Merging two dives can be subtle, because there's two different ways
* of merging:
@ -3401,7 +3405,7 @@ struct dive *merge_dives(const struct dive *a, const struct dive *b, int offset,
offset = 0;
}
if (same_string(a->dc.model, "planned dive")) {
if (is_dc_planner(&a->dc)) {
const struct dive *tmp = a;
a = b;
b = tmp;