Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 7a039d7

Browse files
Merge pull request #387 from fpistm/fix_warning
fix: signed and init field warnings
2 parents bc03713 + bf62cd5 commit 7a039d7

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

‎src/utility/HCI.cpp‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void HCIClass::poll(unsigned long timeout)
139139
while (HCITransport.available()) {
140140
byte b = HCITransport.read();
141141

142-
if (_recvIndex >= sizeof(_recvBuffer)) {
142+
if (_recvIndex >= (int)sizeof(_recvBuffer)) {
143143
_recvIndex = 0;
144144
if (_debug) {
145145
_debug->println("_recvBuffer overflow");
@@ -462,6 +462,8 @@ int HCIClass::leConnUpdate(uint16_t handle, uint16_t minInterval, uint16_t maxIn
462462
return sendCommand(OGF_LE_CTL << 10 | OCF_LE_CONN_UPDATE, sizeof(leConnUpdateData), &leConnUpdateData);
463463
}
464464
void HCIClass::saveNewAddress(uint8_t addressType, uint8_t* address, uint8_t* peerIrk, uint8_t* localIrk){
465+
(void)addressType;
466+
(void)localIrk;
465467
if(_storeIRK!=0){
466468
_storeIRK(address, peerIrk);
467469
}
@@ -504,6 +506,7 @@ int HCIClass::leStartResolvingAddresses(){
504506
return HCI.sendCommand(OGF_LE_CTL << 10 | 0x2D, 1,&enable); // Disable address resolution
505507
}
506508
int HCIClass::leReadPeerResolvableAddress(uint8_t peerAddressType, uint8_t* peerIdentityAddress, uint8_t* peerResolvableAddress){
509+
(void)peerResolvableAddress;
507510
struct __attribute__ ((packed)) Request {
508511
uint8_t addressType;
509512
uint8_t identityAddress[6];
@@ -547,7 +550,7 @@ int HCIClass::readStoredLK(uint8_t BD_ADDR[], uint8_t read_all ){
547550
struct __attribute__ ((packed)) Request {
548551
uint8_t BD_ADDR[6];
549552
uint8_t read_a;
550-
} request = {0,0};
553+
} request = {{0},0};
551554
for(int i=0; i<6; i++) request.BD_ADDR[5-i] = BD_ADDR[i];
552555
request.read_a = read_all;
553556
return sendCommand(OGF_HOST_CTL << 10 | 0xD, sizeof(request), &request);
@@ -1269,7 +1272,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
12691272
uint8_t U[32];
12701273
uint8_t V[32];
12711274
uint8_t Z;
1272-
} f4Params = {0,0,Z};
1275+
} f4Params = {{0},{0},Z};
12731276
for(int i=0; i<32; i++){
12741277
f4Params.U[31-i] = pairingPublicKey.publicKey[i];
12751278
f4Params.V[31-i] = HCI.remotePublicKeyBuffer[i];
@@ -1289,7 +1292,7 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
12891292
#endif
12901293

12911294
uint8_t cb_temp[sizeof(pairingConfirm.cb)];
1292-
for(int i=0; i<sizeof(pairingConfirm.cb);i++){
1295+
for(unsignedint i=0; i<sizeof(pairingConfirm.cb);i++){
12931296
cb_temp[sizeof(pairingConfirm.cb)-1-i] = pairingConfirm.cb[i];
12941297
}
12951298
/// cb wa back to front.
@@ -1373,11 +1376,12 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
13731376
}
13741377
}
13751378
int HCIClass::leEncrypt(uint8_t* key, uint8_t* plaintext, uint8_t* status, uint8_t* ciphertext){
1379+
(void)status;
13761380
struct __attribute__ ((packed)) LeEncryptCommand
13771381
{
13781382
uint8_t key[16];
13791383
uint8_t plaintext[16];
1380-
} leEncryptCommand = {0,0};
1384+
} leEncryptCommand = {{0},{0}};
13811385
for(int i=0; i<16; i++){
13821386
leEncryptCommand.key[15-i] = key[i];
13831387
leEncryptCommand.plaintext[15-i] = plaintext[i];

‎src/utility/L2CAPSignaling.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
122122
#ifdef _BLE_TRACE_
123123
Serial.print("dlen: ");
124124
Serial.println(dlen);
125+
#else
126+
(void)dlen;
125127
#endif
126128
uint8_t code = l2capSignalingHdr->code;
127129

@@ -310,8 +312,8 @@ void L2CAPSignalingClass::handleSecurityData(uint16_t connectionHandle, uint8_t
310312
uint8_t x[32];
311313
uint8_t y[32];
312314
} generateDHKeyCommand = {
313-
0x00,
314-
0x00,
315+
{0x00},
316+
{0x00},
315317
};
316318
memcpy(generateDHKeyCommand.x,connectionPairingPublicKey->x,32);
317319
memcpy(generateDHKeyCommand.y,connectionPairingPublicKey->y,32);

‎src/utility/btct.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ int BluetoothCryptoToolbox::f5(uint8_t DHKey[],uint8_t N_master[], uint8_t N_sla
7171
uint8_t A1[7];
7272
uint8_t A2[7];
7373
uint8_t length[2];
74-
} cmacInput = {0,0,0,0,0,0,0};
74+
} cmacInput = {0,{0},{0},{0},{0},{0},{0}};
7575
cmacInput.counter = 0;
7676
memcpy(cmacInput.keyID, keyID, 4);
7777
memcpy(cmacInput.N1,N_master,16);
@@ -97,7 +97,7 @@ int BluetoothCryptoToolbox::f6(uint8_t W[], uint8_t N1[],uint8_t N2[],uint8_t R[
9797
uint8_t IOCap[3];
9898
uint8_t A1[7];
9999
uint8_t A2[7];
100-
} f6Input = {0,0,0,0,0,0};
100+
} f6Input = {{0},{0},{0},{0},{0},{0}};
101101

102102
memcpy(f6Input.N1, N1, 16);
103103
memcpy(f6Input.N2, N2, 16);
@@ -145,7 +145,7 @@ int BluetoothCryptoToolbox::g2(uint8_t U[], uint8_t V[], uint8_t X[], uint8_t Y[
145145
uint8_t U[32];
146146
uint8_t V[32];
147147
uint8_t Y[16];
148-
} cmacInput= {0,0,0};
148+
} cmacInput= {{0},{0},{0}};
149149
memcpy(cmacInput.U,U,32);
150150
memcpy(cmacInput.V,V,32);
151151
memcpy(cmacInput.Y,Y,16);

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /