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

cleanup: rename set_dc_nickname() to add_devices_of_dive()

Browse source 
The function was misnamed in that it doesn't set the nickname
of a device. Instead, it adds all (unknown) devices of a
dive to the/a device-table. Let's call it appropriately.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-10-18 21:45:50 +02:00 • committed by Dirk Hohndel
parent 39a4090c0a
commit 694776eed1
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/device.cpp
View file

@ -342,12 +342,12 @@ extern "C" int is_default_dive_computer_device(const char *name)
return qPrefDiveComputer::device() == name;
}
extern "C" void set_dc_nickname(struct dive *dive, struct device_table *device_table)
extern "C" void add_devices_of_dive(const struct dive *dive, struct device_table *device_table)
{
if (!dive)
return;
struct divecomputer *dc;
const struct divecomputer *dc;
for_each_dc (dive, dc) {
if (!empty_string(dc->model) && dc->deviceid &&

2
core/device.h
View file

@ -19,7 +19,7 @@ extern struct device_table device_table;
extern void fake_dc(struct divecomputer *dc);
extern void set_dc_deviceid(struct divecomputer *dc, unsigned int deviceid, const struct device_table *table);
extern void set_dc_nickname(struct dive *dive, struct device_table *table);
extern void add_devices_of_dive(const struct dive *dive, struct device_table *table);
extern void create_device_node(struct device_table *table, const char *model, uint32_t deviceid, const char *serial, const char *firmware, const char *nickname);
extern int nr_devices(const struct device_table *table);
extern const struct device *get_device(const struct device_table *table, int i);

6
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, &device_table);
add_devices_of_dive(dive, &device_table);
}
sort_dive_table(&dive_table);
@ -1185,11 +1185,11 @@ void process_imported_dives(struct dive_table *import_table, struct trip_table *
* 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], devices_to_add);
add_devices_of_dive(import_table->dives[0], devices_to_add);
} 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], devices_to_add);
add_devices_of_dive(import_table->dives[i], devices_to_add);
}
/* Sort the table of dives to be imported and combine mergable dives */