mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: add device_table parameter to device table functions

Browse source 
Instead of accessing the global device table directly, add a parameter
to all device-table accessing functions. This makes all places in
the code that access the global device table grep-able, which is
necessary to include the device-table code in the undo system.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-10-10 21:41:36 +02:00 • committed by Dirk Hohndel
parent 7b06349be5
commit 8549f24c91
9 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/divelist.c
View file

@ -826,7 +826,7 @@ void process_loaded_dives()
for_each_dive(i, dive) {
if (!dive->hidden_by_filter)
shown_dives++;
set_dc_nickname(dive);
set_dc_nickname(dive, &device_table);
}
sort_dive_table(&dive_table);
@ -1161,12 +1161,13 @@ void process_imported_dives(struct dive_table *import_table, struct trip_table *
/* check if we need a nickname for the divecomputer for newly downloaded dives;
* since we know they all came from the same divecomputer we just check for the
* first one */
if (flags & IMPORT_IS_DOWNLOADED)
set_dc_nickname(import_table->dives[0]);
else
if (flags & IMPORT_IS_DOWNLOADED) {
set_dc_nickname(import_table->dives[0], &device_table);
} else {
/* they aren't downloaded, so record / check all new ones */
for (i = 0; i < import_table->nr; i++)
set_dc_nickname(import_table->dives[i]);
set_dc_nickname(import_table->dives[i], &device_table);
}
/* Sort the table of dives to be imported and combine mergable dives */
sort_dive_table(import_table);
@ -1375,7 +1376,7 @@ void clear_dive_file_data()
}
clear_dive(&displayed_dive);
clear_device_nodes();
clear_device_nodes(&device_table);
clear_events();
clear_filter_presets();