Change non returning functions to void + spelling (arduino-libraries#251)

dominsch · web-flow · commit fae1e36beead · 2022-08-23T10:46:47.000+02:00
diff --git a/src/utility/ATT.cpp b/src/utility/ATT.cpp
@@ -1272,7 +1272,7 @@ void ATTClass::writeReqOrCmd(uint16_t connectionHandle, uint16_t mtu, uint8_t op
       }
       return;
     }
-    // Check permssion
+    // Check permission
     if((characteristic->permissions() &( BLEPermission::BLEEncryption >> 8)) > 0 && 
        (getPeerEncryption(connectionHandle) & PEER_ENCRYPTION::ENCRYPTED_AES) == 0){
       holdResponse = true;
@@ -1941,4 +1941,4 @@ int ATTClass::getPeerResolvedAddress(uint16_t connectionHandle, uint8_t resolved
 #if !defined(FAKE_ATT)
 ATTClass ATTObj;
 ATTClass& ATT = ATTObj;
-#endif
+#endif
diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
@@ -460,14 +460,14 @@ int HCIClass::leConnUpdate(uint16_t handle, uint16_t minInterval, uint16_t maxIn
 
   return sendCommand(OGF_LE_CTL << 10 | OCF_LE_CONN_UPDATE, sizeof(leConnUpdateData), &leConnUpdateData);
 }
-int HCIClass::saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* localIrk){
+void HCIClass::saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* localIrk){
   if(_storeIRK!=0){
     _storeIRK(address, peerIrk);
   }
   // Again... this should work 
   // leAddResolvingAddress(addressType, address, peerIrk, localIrk);
 }
-int HCIClass::leAddResolvingAddress(uint8_t addressType, uint8_t* peerAddress, uint8_t* peerIrk, uint8_t* localIrk){
+void HCIClass::leAddResolvingAddress(uint8_t addressType, uint8_t* peerAddress, uint8_t* peerIrk, uint8_t* localIrk){
   leStopResolvingAddresses();
 
   struct __attribute__ ((packed)) AddDevice {
@@ -527,7 +527,7 @@ int HCIClass::leReadPeerResolvableAddress(uint8_t peerAddressType, uint8_t* peer
   return res;
 }
 
-int HCIClass::writeLK(uint8_t peerAddress[], uint8_t LK[]){
+void HCIClass::writeLK(uint8_t peerAddress[], uint8_t LK[]){
   struct __attribute__ ((packed)) StoreLK {
     uint8_t nKeys;
     uint8_t BD_ADDR[6];
@@ -538,7 +538,7 @@ int HCIClass::writeLK(uint8_t peerAddress[], uint8_t LK[]){
   for(int i=0; i<16; i++) storeLK.LTK[15-i] = LK[i];
   HCI.sendCommand(OGF_HOST_CTL << 10 | 0x11, sizeof(storeLK), &storeLK);
 }
-int HCIClass::readStoredLKs(){
+void HCIClass::readStoredLKs(){
   uint8_t BD_ADDR[6];
   readStoredLK(BD_ADDR, 1);
 }
diff --git a/src/utility/HCI.h b/src/utility/HCI.h
@@ -99,15 +99,15 @@ class HCIClass {
   virtual AuthReq localAuthreq();
   virtual uint8_t localIOCap();
 
-  virtual int saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
-  virtual int leAddResolvingAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
+  virtual void saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
+  virtual void leAddResolvingAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* remoteIrk);
   virtual int leStopResolvingAddresses();
   virtual int leStartResolvingAddresses();
   virtual int leReadPeerResolvableAddress(uint8_t peerAddressType, uint8_t* peerIdentityAddress, uint8_t* peerResolvableAddress);
 
-  virtual int readStoredLKs();
+  virtual void readStoredLKs();
   virtual int readStoredLK(uint8_t BD_ADDR[], uint8_t read_all = 0);
-  virtual int writeLK(uint8_t peerAddress[], uint8_t LK[]);
+  virtual void writeLK(uint8_t peerAddress[], uint8_t LK[]);
   virtual int tryResolveAddress(uint8_t* BDAddr, uint8_t* address);
 
   virtual int sendAclPkt(uint16_t handle, uint8_t cid, uint8_t plen, void* data);

Original file line number	Diff line number	Diff line change
`@@ -1272,7 +1272,7 @@ void ATTClass::writeReqOrCmd(uint16_t connectionHandle, uint16_t mtu, uint8_t op`
`1272`	`1272`	`}`
`1273`	`1273`	`return;`
`1274`	`1274`	`}`
`1275`		`- // Check permssion`
	`1275`	`+ // Check permission`
`1276`	`1276`	`if((characteristic->permissions() &( BLEPermission::BLEEncryption >> 8)) > 0 &&`
`1277`	`1277`	`(getPeerEncryption(connectionHandle) & PEER_ENCRYPTION::ENCRYPTED_AES) == 0){`
`1278`	`1278`	`holdResponse = true;`
`@@ -1941,4 +1941,4 @@ int ATTClass::getPeerResolvedAddress(uint16_t connectionHandle, uint8_t resolved`
`1941`	`1941`	`#if !defined(FAKE_ATT)`
`1942`	`1942`	`ATTClass ATTObj;`
`1943`	`1943`	`ATTClass& ATT = ATTObj;`
`1944`		`-#endif`
	`1944`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -460,14 +460,14 @@ int HCIClass::leConnUpdate(uint16_t handle, uint16_t minInterval, uint16_t maxIn`
`460`	`460`
`461`	`461`	`return sendCommand(OGF_LE_CTL << 10 \| OCF_LE_CONN_UPDATE, sizeof(leConnUpdateData), &leConnUpdateData);`
`462`	`462`	`}`
`463`		`-int HCIClass::saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* localIrk){`
	`463`	`+void HCIClass::saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* localIrk){`
`464`	`464`	`if(_storeIRK!=0){`
`465`	`465`	`_storeIRK(address, peerIrk);`
`466`	`466`	`}`
`467`	`467`	`// Again... this should work`
`468`	`468`	`// leAddResolvingAddress(addressType, address, peerIrk, localIrk);`
`469`	`469`	`}`
`470`		`-int HCIClass::leAddResolvingAddress(uint8_t addressType, uint8_t* peerAddress, uint8_t* peerIrk, uint8_t* localIrk){`
	`470`	`+void HCIClass::leAddResolvingAddress(uint8_t addressType, uint8_t* peerAddress, uint8_t* peerIrk, uint8_t* localIrk){`
`471`	`471`	`leStopResolvingAddresses();`
`472`	`472`
`473`	`473`	`struct __attribute__ ((packed)) AddDevice {`
`@@ -527,7 +527,7 @@ int HCIClass::leReadPeerResolvableAddress(uint8_t peerAddressType, uint8_t* peer`
`527`	`527`	`return res;`
`528`	`528`	`}`
`529`	`529`
`530`		`-int HCIClass::writeLK(uint8_t peerAddress[], uint8_t LK[]){`
	`530`	`+void HCIClass::writeLK(uint8_t peerAddress[], uint8_t LK[]){`
`531`	`531`	`struct __attribute__ ((packed)) StoreLK {`
`532`	`532`	`uint8_t nKeys;`
`533`	`533`	`uint8_t BD_ADDR[6];`
`@@ -538,7 +538,7 @@ int HCIClass::writeLK(uint8_t peerAddress[], uint8_t LK[]){`
`538`	`538`	`for(int i=0; i<16; i++) storeLK.LTK[15-i] = LK[i];`
`539`	`539`	`HCI.sendCommand(OGF_HOST_CTL << 10 \| 0x11, sizeof(storeLK), &storeLK);`
`540`	`540`	`}`
`541`		`-int HCIClass::readStoredLKs(){`
	`541`	`+void HCIClass::readStoredLKs(){`
`542`	`542`	`uint8_t BD_ADDR[6];`
`543`	`543`	`readStoredLK(BD_ADDR, 1);`
`544`	`544`	`}`