diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-12-23 22:08:00 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-09 20:58:04 -0800 |
| commit | 0249e125898134d3f6d4a2a8972f3eeb30c02803 (patch) | |
| tree | 4830c88c2d61a096a2f1afdcc71bddf8d330cf73 /core/divelist.h | |
| parent | fd196f143ae9c6b3a51b057ba134c5e3a280e30f (diff) | |
| download | subsurface-0249e125898134d3f6d4a2a8972f3eeb30c02803.tar.gz | |
Import: split process_imported_dives() function
Split the process_imported_dives() function in two:
1) process_imported_dives() processes the dives and generates
a list of dives and trips to be added and removed.
2) add_imported_dives() calls process_imported_dives() and
does the actual removal / addition of dives and trips.
The goal is to split preparation and actual work, to
make dive import undo-able.
The code adds extra checks to never merge into the same
dive twice, as this would lead to a double-free() bug.
This should in principle never happen, as dives that
compare equal according to is_same_dive() are merged
in the imported-dives list, but perhaps in some pathologival
corner-cases is_same_dive() turns out to be non-transitive.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/divelist.h')
| -rw-r--r-- | core/divelist.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/divelist.h b/core/divelist.h index 26bd1b3db..d94fedc38 100644 --- a/core/divelist.h +++ b/core/divelist.h @@ -18,8 +18,12 @@ extern int init_decompression(struct deco_state *ds, struct dive *dive); /* divelist core logic functions */ extern void process_loaded_dives(); +extern void add_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table, + bool prefer_imported, bool downloaded, bool merge_all_trips); extern void process_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table, - bool prefer_imported, bool downloaded, bool merge_all_trips); + bool prefer_imported, bool downloaded, bool merge_all_trips, + struct dive_table *dives_to_add, struct dive_table *dives_to_remove, + struct trip_table *trips_to_add); extern char *get_dive_gas_string(const struct dive *dive); extern struct dive **grow_dive_table(struct dive_table *table); |