Parser: parse into custom dive site table

To extend the undo system to dive sites, the importers and downloaders
must not parse directly into the global dive site table. Instead,
pass a dive_site_table argument to parse into.

For now, always pass the global dive_site_table so that this commit
should not cause any functional change.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-02-28 22:45:17 +01:00 committed by Dirk Hohndel
parent 926b6895bb
commit 37146c5742
36 changed files with 216 additions and 185 deletions

View file

@ -1365,7 +1365,7 @@ static void insert_dive(struct dive_table *table, struct dive *d)
}
/*
* Clear a dive_table and a trip_table. Think about generating these with macros.
* Clear a dive_table, trip_table and dive_site_table. Think about generating these with macros.
*/
void clear_table(struct dive_table *table)
{
@ -1381,6 +1381,13 @@ static void clear_trip_table(struct trip_table *table)
table->nr = 0;
}
void clear_dive_site_table(struct dive_site_table *ds_table)
{
for (int i = 0; i < ds_table->nr; i++)
free_dive_site(ds_table->dive_sites[i]);
ds_table->nr = 0;
}
/*
* Try to merge a new dive into the dive at position idx. Return
* true on success. On success, the old dive will be added to the