Fix build

Author: AniruddhaKanhere

docs/doxygen/include/size_table.md

@@ -19,7 +19,7 @@
     </tr>
     <tr>
         <td>core_mqtt_serializer.c</td>
-        <td><center>8.7K</center></td>
+        <td><center>8.8K</center></td>
         <td><center>7.2K</center></td>
     </tr>
     <tr>
@@ -39,7 +39,7 @@
     </tr>
     <tr>
         <td><b>Total estimates</b></td>
-        <td><b><center>21.1K</center></b></td>
+        <td><b><center>21.2K</center></b></td>
         <td><b><center>17.8K</center></b></td>
     </tr>
 </table>

source/core_mqtt.c

@@ -185,7 +185,7 @@ static size_t addEncodedStringToVector( uint8_t serializedLength[ CORE_MQTT_SERI
                                         const char * const string,
                                         uint16_t length,
                                         TransportOutVector_t * iterator,
-                                        size_t * updatedLength );
+                                        uint32_t * updatedLength );
 
 /**
  * @brief Send Subscribe without copying the users data into any buffer.
@@ -2600,7 +2600,7 @@ static size_t addEncodedStringToVector( uint8_t serializedLength[ CORE_MQTT_SERI
                                         const char * const string,
                                         uint16_t length,
                                         TransportOutVector_t * iterator,
-                                        size_t * updatedLength )
+                                        uint32_t * updatedLength )
 {
     size_t packetLength = 0U;
     TransportOutVector_t * pLocalIterator = iterator;
@@ -2653,7 +2653,7 @@ static MQTTStatus_t sendSubscribeWithoutCopy( MQTTContext_t * pContext,
     TransportOutVector_t * pIterator;
     uint8_t serializedTopicFieldLength[ MQTT_SUB_UNSUB_MAX_VECTORS ][ CORE_MQTT_SERIALIZED_LENGTH_FIELD_BYTES ];
     uint8_t subscriptionOptionsArray[ MQTT_SUB_UNSUB_MAX_VECTORS / CORE_MQTT_SUBSCRIBE_PER_TOPIC_VECTOR_LENGTH ];
-    size_t totalPacketLength = 0U;
+    uint32_t totalPacketLength = 0U;
     size_t ioVectorLength = 0U;
     size_t subscriptionsSent = 0U;
     size_t vectorsAdded = 0U;
@@ -2794,7 +2794,7 @@ static MQTTStatus_t sendUnsubscribeWithoutCopy( MQTTContext_t * pContext,
     TransportOutVector_t pIoVector[ MQTT_SUB_UNSUB_MAX_VECTORS ];
     TransportOutVector_t * pIterator;
     uint8_t serializedTopicFieldLength[ MQTT_SUB_UNSUB_MAX_VECTORS ][ CORE_MQTT_SERIALIZED_LENGTH_FIELD_BYTES ];
-    size_t totalPacketLength = 0U;
+    uint32_t totalPacketLength = 0U;
     size_t ioVectorLength = 0U;
     size_t unsubscriptionsSent = 0U;
     size_t vectorsAdded = 0U;
@@ -3648,12 +3648,11 @@ static MQTTStatus_t validateSharedSubscriptions( const MQTTContext_t * pContext,
     bool isSharedSub = ( topicFilterLength > 7U );
     const char * shareNameEnd;
     const char * shareNameStart;
-    size_t topicFilterMaxLen;
 
     /* Need to check this only if the length is proper. */
     if( pSubscriptionList[ iterator ].topicFilterLength > 7U )
     {
-        isSharedSub = ( isSharedSub ) && ( ( strncmp( pSubscriptionList[ iterator ].pTopicFilter, "$share/", topicFilterMaxLen ) ) == 0 );
+        isSharedSub = ( isSharedSub ) && ( ( strncmp( pSubscriptionList[ iterator ].pTopicFilter, "$share/", 7U ) ) == 0 );
     }
 
     if( isSharedSub )

source/core_mqtt_serializer.c

@@ -1897,7 +1897,9 @@ static MQTTStatus_t validateSubscriptionSerializeParams( const MQTTSubscribeInfo
 
         if( status == MQTTSuccess )
         {
-            for( size_t it = 0; it < subscriptionCount; it++ )
+            size_t it;
+
+            for( it = 0; it < subscriptionCount; it++ )
             {
                 /* Check whether the topic filter and the topic filter length are non-zero. */
                 if( ( pSubscriptionList[ it ].pTopicFilter == NULL ) || ( pSubscriptionList[ it ].topicFilterLength == 0 ) )
@@ -2966,16 +2968,16 @@ MQTTStatus_t MQTT_GetConnectPacketSize( const MQTTConnectInfo_t * pConnectInfo,
                                         const MQTTPublishInfo_t * pWillInfo,
                                         const MQTTPropBuilder_t * pConnectProperties,
                                         const MQTTPropBuilder_t * pWillProperties,
-                                        size_t * pRemainingLength,
-                                        size_t * pPacketSize )
+                                        uint32_t * pRemainingLength,
+                                        uint32_t * pPacketSize )
 {
     MQTTStatus_t status = MQTTSuccess;
-    size_t remainingLength;
+    uint32_t remainingLength;
     size_t propertyLength = 0U;
     size_t willPropertyLength = 0U;
 
     /* The CONNECT packet will always include a 10-byte variable header without connect properties. */
-    size_t connectPacketSize = MQTT_PACKET_CONNECT_HEADER_SIZE;
+    uint32_t connectPacketSize = MQTT_PACKET_CONNECT_HEADER_SIZE;
 
     /* Validate arguments. */
     if( ( pConnectInfo == NULL ) || ( pRemainingLength == NULL ) ||
@@ -2994,18 +2996,6 @@ MQTTStatus_t MQTT_GetConnectPacketSize( const MQTTConnectInfo_t * pConnectInfo,
         LogError( ( "Client ID length and value mismatch." ) );
         status = MQTTBadParameter;
     }
-    else if( ( pConnectInfo->clientIdentifierLength > UINT16_MAX ) ||
-             ( pConnectInfo->userNameLength > UINT16_MAX ) ||
-             ( pConnectInfo->passwordLength > UINT16_MAX ) )
-    {
-        LogError( ( "Client ID, userName and password length cannot be greater than %d. "
-                    "Client ID: %lu, User name len: %lu, Password len: %lu"
-                    UINT16_MAX,
-                    ( unsigned long ) pConnectInfo->clientIdentifierLength,
-                    ( unsigned long ) pConnectInfo->userNameLength,
-                    ( unsigned long ) pConnectInfo->passwordLength ) );
-        status = MQTTBadParameter;
-    }
     else if( ( pWillInfo != NULL ) && ( pWillInfo->payloadLength > ( size_t ) UINT16_MAX ) )
     {
         /* The MQTTPublishInfo_t is reused for the will message. The payload
@@ -3017,12 +3007,6 @@ MQTTStatus_t MQTT_GetConnectPacketSize( const MQTTConnectInfo_t * pConnectInfo,
                     ( unsigned long ) pWillInfo->payloadLength ) );
         status = MQTTBadParameter;
     }
-    else if( ( pWillInfo != NULL ) && ( pWillInfo->topicNameLength > ( size_t ) UINT16_MAX ) )
-    {
-        LogError( ( "The Will topic length must not exceed %d.",
-                    UINT16_MAX ) );
-        status = MQTTBadParameter;
-    }
     else
     {
         /* Do Nothing. */

source/include/core_mqtt_serializer.h

@@ -793,8 +793,8 @@ MQTTStatus_t MQTT_GetConnectPacketSize( const MQTTConnectInfo_t * pConnectInfo,
                                         const MQTTPublishInfo_t * pWillInfo,
                                         const MQTTPropBuilder_t * pConnectProperties,
                                         const MQTTPropBuilder_t * pWillProperties,
-                                        size_t * pRemainingLength,
-                                        size_t * pPacketSize );
+                                        uint32_t * pRemainingLength,
+                                        uint32_t * pPacketSize );
 /* @[declare_mqtt_getconnectpacketsize] */
 
 /**

source/include/private/core_mqtt_serializer_private.h

@@ -439,19 +439,6 @@ MQTTStatus_t decodeVariableLength( const uint8_t * pBuffer,
                                    size_t bufferLength,
                                    uint32_t * pLength );
 
-/**
- * @brief Encodes the remaining length of the packet using the variable length
- * encoding scheme provided in the MQTT v3.1.1 specification.
- *
- * @param[out] pDestination The destination buffer to store the encoded remaining
- * length.
- * @param[in] length The remaining length to encode.
- *
- * @return The location of the byte following the encoded value.
- */
-uint8_t * encodeVariableLength( uint8_t * pDestination,
-                                size_t length );
-
 /**
  * @brief Serialize the fixed size part of the ack packet header.
  *