Consistently use for_each_dive (and use it correctly)

The way the macro is written there is no need to test the dive against
NULL before dereferencing.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-05-20 06:37:19 +09:00
parent b303f217a9
commit 09e7c61fee
5 changed files with 17 additions and 25 deletions

View file

@ -133,7 +133,9 @@ bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile,
}
/* walk the dive list in chronological order */
for (int i = 0; i < dive_table.nr; i++) {
int i;
struct dive *dive;
for_each_dive(i, dive) {
FILE *f;
char filename[PATH_MAX];
int streamsize;
@ -145,9 +147,6 @@ bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile,
* Get the i'th dive in XML format so we can process it.
* We need to save to a file before we can reload it back into memory...
*/
struct dive *dive = get_dive(i);
if (!dive)
continue;
if (selected && !dive->selected)
continue;
f = tmpfile();