diff options
| -rw-r--r-- | core/device.cpp | 9 | ||||
| -rw-r--r-- | core/device.h | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/core/device.cpp b/core/device.cpp index b65c8dd7f..b688e36eb 100644 --- a/core/device.cpp +++ b/core/device.cpp @@ -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(); diff --git a/core/device.h b/core/device.h index a976a7e64..22163e56c 100644 --- a/core/device.h +++ b/core/device.h @@ -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); |