When merging dives, match up the cylinders to each other using gasmix

.. so that different computers that have different ordering of the same
cylinders will see the end result the same way.

This also fixes up the sample sensor index and generates special initial
tank change events for the dive computers that had their cylinder
indexes renamed on them.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2013-03-27 19:04:46 -07:00 committed by Dirk Hohndel
parent c083ec45a9
commit f2f29665d4
3 changed files with 150 additions and 20 deletions

View file

@ -1533,7 +1533,7 @@ static int get_cylinder_index(struct dive *dive, struct event *ev)
return 0;
}
static struct event *get_next_event(struct event *event, char *name)
struct event *get_next_event(struct event *event, char *name)
{
if (!name || !*name)
return NULL;