From bb85d083a7899890d0c14502078f6fa60a09d5df Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 28 Feb 2012 20:40:24 +0000 Subject: Fix warnings and errors found by the new cppcheck provided static code analysis. --- Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Demos') diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c index 15b98215c..a02a66b7b 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c @@ -473,8 +473,8 @@ static inline void Bluetooth_Signal_ConnectionReq(const BT_Signal_Header_t* cons ResponsePacket.SignalCommandHeader.Length = sizeof(ResponsePacket.ConnectionResponse); /* Fill out the Connection Response in the response packet */ - ResponsePacket.ConnectionResponse.DestinationChannel = ChannelData->LocalNumber; - ResponsePacket.ConnectionResponse.SourceChannel = ChannelData->RemoteNumber; + ResponsePacket.ConnectionResponse.DestinationChannel = (ChannelData != NULL) ? ChannelData->LocalNumber : 0; + ResponsePacket.ConnectionResponse.SourceChannel = (ChannelData != NULL) ? ChannelData->RemoteNumber : 0; ResponsePacket.ConnectionResponse.Result = ChannelStatus; ResponsePacket.ConnectionResponse.Status = 0x00; @@ -576,7 +576,7 @@ static inline void Bluetooth_Signal_ConfigurationReq(const BT_Signal_Header_t* c ResponsePacket.SignalCommandHeader.Length = sizeof(ResponsePacket.ConfigurationResponse); /* Fill out the Configuration Response in the response packet */ - ResponsePacket.ConfigurationResponse.SourceChannel = ChannelData->RemoteNumber; + ResponsePacket.ConfigurationResponse.SourceChannel = (ChannelData != NULL) ? ChannelData->RemoteNumber : 0; ResponsePacket.ConfigurationResponse.Flags = 0x00; ResponsePacket.ConfigurationResponse.Result = (ChannelData != NULL) ? BT_CONFIGURATION_SUCCESSFUL : BT_CONFIGURATION_REJECTED; @@ -681,8 +681,8 @@ static inline void Bluetooth_Signal_DisconnectionReq(const BT_Signal_Header_t* c ResponsePacket.SignalCommandHeader.Length = sizeof(ResponsePacket.DisconnectionResponse); /* Fill out the Disconnection Response in the response packet */ - ResponsePacket.DisconnectionResponse.DestinationChannel = ChannelData->RemoteNumber; - ResponsePacket.DisconnectionResponse.SourceChannel = ChannelData->LocalNumber; + ResponsePacket.DisconnectionResponse.DestinationChannel = (ChannelData != NULL) ? ChannelData->RemoteNumber : 0; + ResponsePacket.DisconnectionResponse.SourceChannel = (ChannelData != NULL) ? ChannelData->LocalNumber : 0; Bluetooth_SendPacket(&ResponsePacket, sizeof(ResponsePacket), NULL); -- cgit v1.2.3