From a0beb81a4c33d49b3ef2b6c505a24a490cd35298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eckhard=20V=C3=B6llm?= <34288016+iltis42@users.noreply.github.com> Date: Mon, 17 Jan 2022 15:31:58 +0100 Subject: [PATCH] Consistently change device index to singed integer in BluetoothSerial lib (#6109) * change parameter to signed int As of wrong paramater, the following problem existed, that will be fixed now with this change. BTScanResultsSet.cpp:67:8: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits] if (i < 0) * Change parameter and variable to int As of wrong paramater, the following problem existed, that will be fixed now with this change. BTScanResultsSet.cpp:67:8: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits] if (i < 0) --- libraries/BluetoothSerial/src/BTScan.h | 6 +++--- libraries/BluetoothSerial/src/BTScanResultsSet.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/BluetoothSerial/src/BTScan.h b/libraries/BluetoothSerial/src/BTScan.h index 3650d416..2851fdd3 100644 --- a/libraries/BluetoothSerial/src/BTScan.h +++ b/libraries/BluetoothSerial/src/BTScan.h @@ -24,14 +24,14 @@ public: virtual void dump(Print *print = nullptr); virtual int getCount(); - virtual BTAdvertisedDevice* getDevice(uint32_t i); + virtual BTAdvertisedDevice* getDevice(int i); }; class BTScanResultsSet : public BTScanResults { public: void dump(Print *print = nullptr); int getCount(); - BTAdvertisedDevice* getDevice(uint32_t i); + BTAdvertisedDevice* getDevice(int i); bool add(BTAdvertisedDeviceSet advertisedDevice, bool unique = true); void clear(); @@ -39,4 +39,4 @@ public: std::map m_vectorAdvertisedDevices; }; -#endif \ No newline at end of file +#endif diff --git a/libraries/BluetoothSerial/src/BTScanResultsSet.cpp b/libraries/BluetoothSerial/src/BTScanResultsSet.cpp index 79d23e46..e347228c 100644 --- a/libraries/BluetoothSerial/src/BTScanResultsSet.cpp +++ b/libraries/BluetoothSerial/src/BTScanResultsSet.cpp @@ -63,11 +63,11 @@ int BTScanResultsSet::getCount() { * @param [in] i The index of the device. * @return The device at the specified index. */ -BTAdvertisedDevice* BTScanResultsSet::getDevice(uint32_t i) { +BTAdvertisedDevice* BTScanResultsSet::getDevice(int i) { if (i < 0) return nullptr; - uint32_t x = 0; + int x = 0; BTAdvertisedDeviceSet* pDev = &m_vectorAdvertisedDevices.begin()->second; for (auto it = m_vectorAdvertisedDevices.begin(); it != m_vectorAdvertisedDevices.end(); it++) { pDev = &it->second; @@ -92,4 +92,4 @@ bool BTScanResultsSet::add(BTAdvertisedDeviceSet advertisedDevice, bool unique) return false; } -#endif \ No newline at end of file +#endif