diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2014-05-14 00:32:45 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-05-20 11:51:40 +0900 |
| commit | 05d9cc409c7ddffcd981c0dafaf67ba6935cc0ba (patch) | |
| tree | 99fd8e916a1aedcee8bcfa224cc51597515f3837 /divecomputer.cpp | |
| parent | 91c20357f510fe7ea1c5740eb476fd718e41259c (diff) | |
| download | subsurface-05d9cc409c7ddffcd981c0dafaf67ba6935cc0ba.tar.gz | |
Migrate code to for_each_dive and for_each_dc
[Dirk Hohndel: this overlapped with my commit 09e7c61feeea ("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>
Diffstat (limited to 'divecomputer.cpp')
| -rw-r--r-- | divecomputer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/divecomputer.cpp b/divecomputer.cpp index 6044f1aa6..c714137a2 100644 --- a/divecomputer.cpp +++ b/divecomputer.cpp @@ -162,9 +162,9 @@ extern "C" void set_dc_nickname(struct dive *dive) if (!dive) return; - struct divecomputer *dc = &dive->dc; + struct divecomputer *dc; - while (dc) { + for_each_dc(dive, dc) { if (dc->model && *dc->model && dc->deviceid && !dcList.getExact(dc->model, dc->deviceid)) { // we don't have this one, yet @@ -181,6 +181,5 @@ extern "C" void set_dc_nickname(struct dive *dive) dcList.addDC(dc->model, dc->deviceid); } } - dc = dc->next; } } |