Replace cylinder_is_used with is_cylinder_used

is_cylinder_used uses get_cylinder_index as underlaying function that
does the right thing with with respect on how to find the closest
matching cylinder, and handles both types of gaschange events correctly.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2014-07-17 17:19:19 +02:00 committed by Dirk Hohndel
parent 810880ea1d
commit 950638ec1c
6 changed files with 7 additions and 32 deletions

2
dive.c
View file

@ -448,7 +448,7 @@ void copy_cylinders(struct dive *s, struct dive *d, bool used_only)
if (!s || !d)
return;
for (i = 0; i < MAX_CYLINDERS; i++)
if (!used_only || cylinder_is_used(s, &s->cylinder[i]))
if (!used_only || is_cylinder_used(s, i))
d->cylinder[i] = s->cylinder[i];
else
memset(&d->cylinder[i], 0, sizeof(cylinder_t));