Migrate code to for_each_dive and for_each_dc

[Dirk Hohndel: this overlapped with my commit 09e7c61fee ("Consistently
	       use for_each_dive (and use it correctly)") so I took the
	       pieces that I had missed]

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-05-14 00:32:45 +02:00 committed by Dirk Hohndel
parent 91c20357f5
commit 05d9cc409c
6 changed files with 9 additions and 21 deletions

View file

@ -294,12 +294,12 @@ void get_selected_dives_text(char *buffer, int size)
static bool is_gas_used(struct dive *dive, int idx)
{
struct divecomputer *dc = &dive->dc;
struct divecomputer *dc;
bool firstGasExplicit = false;
if (cylinder_none(&dive->cylinder[idx]))
return false;
while (dc) {
for_each_dc(dive, dc) {
struct event *event = get_next_event(dc->events, "gaschange");
while (event) {
if (event->time.seconds < 30)
@ -308,7 +308,6 @@ static bool is_gas_used(struct dive *dive, int idx)
return true;
event = get_next_event(event->next, "gaschange");
}
dc = dc->next;
}
if (idx == 0 && !firstGasExplicit)
return true;