diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-01-13 22:53:57 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-19 13:48:17 -0800 |
| commit | 891fcbf520f28ef6016d6171eba83c6773efca00 (patch) | |
| tree | 22952fe84f0ff56f9ceffdac35c1e1329c7534e3 /core/divelist.h | |
| parent | ff9506b21bbb9910256841dcb577bcb2e19047e8 (diff) | |
| download | subsurface-891fcbf520f28ef6016d6171eba83c6773efca00.tar.gz | |
Import: control process_imported_dives() by flags
process_imported_dives() takes four boolean parameters. Replace these
by flags. This makes the function calls much more descriptive. Morover,
it becomes easier to add or remove flags.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/divelist.h')
| -rw-r--r-- | core/divelist.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/core/divelist.h b/core/divelist.h index 5c1667314..ae36de9db 100644 --- a/core/divelist.h +++ b/core/divelist.h @@ -18,10 +18,13 @@ 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, bool add_to_new_trip); -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 add_to_new_trip, +/* flags for process_imported_dives() */ +#define IMPORT_PREFER_IMPORTED (1 << 0) +#define IMPORT_IS_DOWNLOADED (1 << 1) +#define IMPORT_MERGE_ALL_TRIPS (1 << 2) +#define IMPORT_ADD_TO_NEW_TRIP (1 << 3) +extern void add_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table, int flags); +extern void process_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table, int flags, 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); |