@@ -278,7 +278,7 @@ CHIP_ERROR BtpEngine::HandleCharacteristicReceived(System::PacketBufferHandle &&
278
278
// mRxFragmentSize may be smaller than the characteristic size. Make sure
279
279
// we're not truncating to a data length smaller than what we have already consumed.
280
280
VerifyOrExit (reader.OctetsRead () <= mRxFragmentSize , err = BLE_ERROR_REASSEMBLER_INCORRECT_STATE);
281
- data->SetDataLength (chip::min (data->DataLength (), mRxFragmentSize ));
281
+ data->SetDataLength (chip::min (data->DataLength (), static_cast < size_t >( mRxFragmentSize ) ));
282
282
283
283
// Now mark the bytes we consumed as consumed.
284
284
data->ConsumeHead (static_cast <uint16_t >(reader.OctetsRead ()));
@@ -342,11 +342,11 @@ CHIP_ERROR BtpEngine::HandleCharacteristicReceived(System::PacketBufferHandle &&
342
342
if (rx_flags.Has (HeaderFlags::kEndMessage ))
343
343
{
344
344
// Trim remainder, if any, of the received packet buffer based on sender-specified length of reassembled message.
345
- int padding = mRxBuf ->DataLength () - mRxLength ;
345
+ int padding = static_cast < uint16_t >( mRxBuf ->DataLength () ) - mRxLength ;
346
346
347
347
if (padding > 0 )
348
348
{
349
- mRxBuf ->SetDataLength (mRxLength );
349
+ mRxBuf ->SetDataLength (static_cast < size_t >( mRxLength ) );
350
350
}
351
351
352
352
// Ensure all received fragments add up to sender-specified total message size.
@@ -371,7 +371,7 @@ CHIP_ERROR BtpEngine::HandleCharacteristicReceived(System::PacketBufferHandle &&
371
371
}
372
372
if (!mRxBuf .IsNull ())
373
373
{
374
- ChipLogError (Ble, " With rx buf data length = %u" , mRxBuf ->DataLength ());
374
+ ChipLogError (Ble, " With rx buf data length = %u" , static_cast < unsigned >( mRxBuf ->DataLength () ));
375
375
}
376
376
LogState ();
377
377
@@ -424,7 +424,7 @@ bool BtpEngine::HandleCharacteristicSend(System::PacketBufferHandle data, bool s
424
424
425
425
mTxBuf = std::move (data);
426
426
mTxState = kState_InProgress ;
427
- mTxLength = mTxBuf ->DataLength ();
427
+ mTxLength = static_cast < uint16_t >( mTxBuf ->DataLength () );
428
428
429
429
ChipLogDebugBtpEngine (Ble, " >>> CHIPoBle preparing to send whole message:" );
430
430
PrintBufDebug (mTxBuf );
0 commit comments