Skip to content

Commit

Permalink
Consistently change device index to singed integer in BluetoothSerial…
Browse files Browse the repository at this point in the history
… 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)
  • Loading branch information
iltis42 authored Jan 17, 2022
1 parent 460af2e commit a0beb81
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions libraries/BluetoothSerial/src/BTScan.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ class BTScanResults {

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();

std::map<std::string, BTAdvertisedDeviceSet> m_vectorAdvertisedDevices;
};

#endif
#endif
6 changes: 3 additions & 3 deletions libraries/BluetoothSerial/src/BTScanResultsSet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -92,4 +92,4 @@ bool BTScanResultsSet::add(BTAdvertisedDeviceSet advertisedDevice, bool unique)
return false;
}

#endif
#endif

0 comments on commit a0beb81

Please sign in to comment.