mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: make get_device_for_dc() accessible from C

Browse source 
The function getDCExact() was used to search for a device structure
matching a divecomputer. Since C code can now access struct device,
we can export that function to C. Rename it to get_device_for_dc()
for consistency with naming of the core functions.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-10-05 21:12:49 +02:00 committed by Dirk Hohndel
parent c4bfecce1b
commit 74b8d13672
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/device.cpp
View file

@ -213,8 +213,9 @@ bool device::operator<(const device &a) const
return std::tie(deviceId, model) < std::tie(a.deviceId, a.model);
}
static const device *getDCExact(const std::vector<device> &dcs, const divecomputer *dc)
const struct device *get_device_for_dc(const struct device_table *table, const struct divecomputer *dc)
{
const std::vector<device> &dcs = table->devices;
auto it = std::lower_bound(dcs.begin(), dcs.end(), device{dc->model, dc->deviceid, {}, {}, {}});
return it != dcs.end() && it->model == dc->model && it->deviceId == dc->deviceid ? &*it : NULL;
}
@ -234,7 +235,7 @@ extern "C" void set_dc_deviceid(struct divecomputer *dc, unsigned int deviceid)
if (!dc->model)
return;
const device *node = getDCExact(device_table.devices, dc);
const device *node = get_device_for_dc(&device_table, dc);
if (!node)
return;
@ -329,7 +330,7 @@ extern "C" void set_dc_nickname(struct dive *dive)
for_each_dc (dive, dc) {
if (!empty_string(dc->model) && dc->deviceid &&
!getDCExact(device_table.devices, dc)) {
!get_device_for_dc(&device_table, dc)) {
// we don't have this one, yet
auto it = std::find_if(device_table.devices.begin(), device_table.devices.end(),
[dc] (const device &dev)
@ -351,7 +352,7 @@ extern "C" void set_dc_nickname(struct dive *dive)
const char *get_dc_nickname(const struct divecomputer *dc)
{
const device *existNode = getDCExact(device_table.devices, dc);
const device *existNode = get_device_for_dc(&device_table, dc);
if (existNode && !existNode->nickName.empty())
return existNode->nickName.c_str();

2
core/device.h
View file

@ -26,6 +26,8 @@ extern void call_for_each_dc(void *f, void (*callback)(void *, const char *, uin
extern void clear_device_nodes();
const char *get_dc_nickname(const struct divecomputer *dc);
extern const struct device *get_device_for_dc(const struct device_table *table, const struct divecomputer *dc);
// struct device accessors for C-code. The returned strings are not stable!
const char *device_get_model(const struct device *dev);
const uint32_t device_get_id(const struct device *dev);