Skip to content

Commit d52bddf

Browse files
committed
minor fix
1 parent 186c09c commit d52bddf

File tree

4 files changed

+3397
-3399
lines changed

4 files changed

+3397
-3399
lines changed

source/core_mqtt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1584,7 +1584,7 @@ static MQTTStatus_t handleIncomingPublish( MQTTContext_t * pContext,
15841584
publishRecordState = MQTT_CalculateStatePublish( MQTT_RECEIVE,
15851585
publishInfo.qos );
15861586

1587-
LogDebug(("Incoming publish packet with packet id %hu already exists.", F
1587+
LogDebug(("Incoming publish packet with packet id %hu already exists.",
15881588
( unsigned short ) packetIdentifier ) );
15891589

15901590
if( publishInfo.dup == false )

source/core_mqtt_serializer.c

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ static MQTTStatus_t deserializeConnack(MQTTConnectProperties_t* pConnackProperti
504504
*
505505
* @return #MQTTSuccess, #MQTTServerRefused and #MQTTBadResponse.
506506
*/
507-
static MQTTStatus_t logAckResponse( MQTTSuccessFailReasonCode_t reasonCode,
507+
static MQTTStatus_t logAckResponse( uint8_t reasonCode,
508508
uint16_t packetIdentifier );
509509

510510
/**
@@ -516,7 +516,7 @@ static MQTTStatus_t logAckResponse( MQTTSuccessFailReasonCode_t reasonCode,
516516
*
517517
* @return #MQTTSuccess, #MQTTServerRefused and #MQTTBadResponse.
518518
*/
519-
static MQTTStatus_t logSimpleAckResponse( MQTTSuccessFailReasonCode_t reasonCode,
519+
static MQTTStatus_t logSimpleAckResponse( uint8_t reasonCode,
520520
uint16_t packetIdentifier );
521521

522522
/**
@@ -561,7 +561,7 @@ static MQTTStatus_t deserializeSimpleAck(const MQTTPacketInfo_t* pAck,
561561
*
562562
* @return #MQTTSuccess,#MQTTBadParameter and #MQTTBadResponse.
563563
*/
564-
static MQTTStatus_t validateDisconnectResponse( MQTTSuccessFailReasonCode_t reasonCode,
564+
static MQTTStatus_t validateDisconnectResponse( uint8_t reasonCode,
565565
bool incoming );
566566

567567
static MQTTStatus_t deserializeSubackProperties(MqttPropBuilder_t* propBuffer, uint8_t* pIndex);
@@ -1324,8 +1324,7 @@ static MQTTStatus_t readSubackStatus(size_t statusCount, const uint8_t* pStatusS
13241324
}
13251325
if ((status == MQTTSuccess) || (status == MQTTServerRefused))
13261326
{
1327-
/* coverity[misra_c_2012_rule_11_3_violation] */
1328-
ackInfo->reasonCode = (const MQTTSuccessFailReasonCode_t *) pStatusStart;
1327+
ackInfo->reasonCode = pStatusStart;
13291328
ackInfo->reasonCodeLength = statusCount;
13301329
}
13311330
return status;
@@ -1464,8 +1463,7 @@ static MQTTStatus_t deserializeSimpleAck( const MQTTPacketInfo_t * pAck,
14641463
/* If reason code is success, server can choose to not send the reason code.*/
14651464
if( ( status == MQTTSuccess ) && ( pAck->remainingLength > 2U ) )
14661465
{
1467-
/* coverity[misra_c_2012_rule_11_3_violation] */
1468-
pReasonCode->reasonCode = (const MQTTSuccessFailReasonCode_t *) pIndex ;
1466+
pReasonCode->reasonCode = pIndex ;
14691467
pReasonCode->reasonCodeLength = 1U;
14701468
pIndex++;
14711469
}
@@ -2674,7 +2672,7 @@ static MQTTStatus_t deserializeConnack( MQTTConnectProperties_t * pConnackProper
26742672

26752673
/*-----------------------------------------------------------*/
26762674

2677-
static MQTTStatus_t logAckResponse( MQTTSuccessFailReasonCode_t reasonCode,
2675+
static MQTTStatus_t logAckResponse( uint8_t reasonCode,
26782676
uint16_t packetIdentifier )
26792677
{
26802678
MQTTStatus_t status = MQTTServerRefused;
@@ -2737,7 +2735,7 @@ static MQTTStatus_t logAckResponse( MQTTSuccessFailReasonCode_t reasonCode,
27372735

27382736
/*-----------------------------------------------------------*/
27392737

2740-
static MQTTStatus_t logSimpleAckResponse( MQTTSuccessFailReasonCode_t reasonCode,
2738+
static MQTTStatus_t logSimpleAckResponse( uint8_t reasonCode,
27412739
uint16_t packetIdentifier )
27422740
{
27432741
MQTTStatus_t status = MQTTServerRefused;
@@ -2837,7 +2835,7 @@ static MQTTStatus_t decodeAckProperties(MqttPropBuilder_t* propBuffer,
28372835

28382836
/*-----------------------------------------------------------*/
28392837

2840-
static MQTTStatus_t validateDisconnectResponse( MQTTSuccessFailReasonCode_t reasonCode,
2838+
static MQTTStatus_t validateDisconnectResponse( uint8_t reasonCode,
28412839
bool incoming )
28422840
{
28432841
MQTTStatus_t status;
@@ -3605,8 +3603,7 @@ MQTTStatus_t MQTT_DeserializeDisconnect( const MQTTPacketInfo_t * pPacket,
36053603
{
36063604
/* Extract the reason code */
36073605
pIndex = pPacket->pRemainingData;
3608-
/* coverity[misra_c_2012_rule_11_3_violation] */
3609-
pDisconnectInfo->reasonCode = (const MQTTSuccessFailReasonCode_t* )pIndex;
3606+
pDisconnectInfo->reasonCode = pIndex;
36103607
pDisconnectInfo->reasonCodeLength = 1U;
36113608
pIndex++;
36123609
/*Validate the reason code.*/

source/include/core_mqtt_serializer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ typedef struct MQTTConnectProperties
659659
*/
660660
typedef struct MQTTReasonCodeInfo
661661
{
662-
const MQTTSuccessFailReasonCode_t * reasonCode;
662+
uint8_t * reasonCode;
663663
size_t reasonCodeLength ;
664664

665665
} MQTTReasonCodeInfo_t;

0 commit comments

Comments
 (0)