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

devices: use case-insensitive comparison for model

Browse source 
Recently, the sorting of the devices was changed to be
case-insensitive for models for consistency reasons. However,
then the equality-comparison should also be case-insensitive.

Break it out into its own function, to avoid that mistake
in the future.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-10-17 13:54:29 +02:00 • committed by Dirk Hohndel
parent c046742288
commit 6b1be8c4f6
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/device.cpp
View file

@ -203,6 +203,11 @@ bool device::operator==(const device &a) const
nickName == a.nickName; nickName == a.nickName;
} }
static bool same_device(const device &dev1, const device &dev2)
{
return dev1.deviceId == dev2.deviceId && strcoll(dev1.model.c_str(), dev2.model.c_str()) == 0;
}
bool device::operator<(const device &a) const bool device::operator<(const device &a) const
{ {
if (deviceId != a.deviceId) if (deviceId != a.deviceId)
@ -216,8 +221,9 @@ bool device::operator<(const device &a) const
const struct device *get_device_for_dc(const struct device_table *table, const struct 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; const std::vector<device> &dcs = table->devices;
auto it = std::lower_bound(dcs.begin(), dcs.end(), device{dc->model, dc->deviceid, {}, {}, {}}); device dev { dc->model, dc->deviceid, {}, {}, {} };
return it != dcs.end() && it->model == dc->model && it->deviceId == dc->deviceid ? &*it : NULL; auto it = std::lower_bound(dcs.begin(), dcs.end(), dev);
return it != dcs.end() && same_device(*it, dev) ? &*it : NULL;
} }
/* /*
@ -263,8 +269,9 @@ static void addDC(std::vector<device> &dcs, const std::string &m, uint32_t d, co
{ {
if (m.empty() || d == 0) if (m.empty() || d == 0)
return; return;
auto it = std::lower_bound(dcs.begin(), dcs.end(), device{m, d, {}, {}, {}}); device dev { m, d, {}, {}, {} };
if (it != dcs.end() && it->model == m && it->deviceId == d) { auto it = std::lower_bound(dcs.begin(), dcs.end(), dev);
if (it != dcs.end() && same_device(*it, dev)) {
// debugging: show changes // debugging: show changes
if (verbose) if (verbose)
it->showchanges(n, s, f); it->showchanges(n, s, f);