Diff: mqtt_client.c

Revision:

10:2ab268507775

Parent:

9:37d14c31ff6e

Child:

11:a0a6a4cf7812

--- a/mqtt_client.c	Wed Nov 16 21:38:15 2016 -0800
+++ b/mqtt_client.c	Wed Dec 14 16:00:23 2016 -0800
@@ -26,7 +26,6 @@
 #define DEFAULT_MAX_PING_RESPONSE_TIME  80  // % of time to send pings
 #define MAX_CLOSE_RETRIES               10
 
-static const char* FORMAT_HEX_CHAR = "0x%02x ";
 static const char* TRUE_CONST = "true";
 static const char* FALSE_CONST = "false";
 
@@ -38,7 +37,7 @@
     MQTTCODEC_HANDLE codec_handle;
     CONTROL_PACKET_TYPE packetState;
     TICK_COUNTER_HANDLE packetTickCntr;
-    uint64_t packetSendTimeMs;
+    tickcounter_ms_t packetSendTimeMs;
     ON_MQTT_OPERATION_CALLBACK fnOperationCallback;
     ON_MQTT_MESSAGE_RECV_CALLBACK fnMessageRecv;
     void* ctx;
@@ -51,7 +50,7 @@
     bool socketConnected;
     bool logTrace;
     bool rawBytesTrace;
-    uint64_t timeSincePing;
+    tickcounter_ms_t timeSincePing;
     uint16_t maxPingRespTime;
 } MQTT_CLIENT;
 
@@ -260,7 +259,7 @@
         LOG(LOG_TRACE, 0, "-> %s %s: ", tmBuffer, retrievePacketType((unsigned char)data[0]));
         for (size_t index = 0; index < length; index++)
         {
-            LOG(LOG_TRACE, 0, (char*)FORMAT_HEX_CHAR, data[index]);
+            LOG(LOG_TRACE, 0, "0x%02x ", data[index]);
         }
         LOG(LOG_TRACE, LOG_LINE, "");
     }
@@ -291,7 +290,7 @@
             LOG(LOG_TRACE, 0, "<- %s %s: 0x%02x 0x%02x ", tmBuffer, retrievePacketType((CONTROL_PACKET_TYPE)packet), (unsigned char)(packet | flags), length);
             for (size_t index = 0; index < length; index++)
             {
-                LOG(LOG_TRACE, 0, (char*)FORMAT_HEX_CHAR, data[index]);
+                LOG(LOG_TRACE, 0, "0x%02x ", data[index]);
             }
             LOG(LOG_TRACE, LOG_LINE, "");
         }
@@ -1102,7 +1101,7 @@
         /*Codes_SRS_MQTT_CLIENT_07_025: [mqtt_client_dowork shall retrieve the the last packet send value and ...]*/
         if (mqtt_client->socketConnected && mqtt_client->clientConnected && mqtt_client->keepAliveInterval > 0)
         {
-            uint64_t current_ms;
+            tickcounter_ms_t current_ms;
             if (tickcounter_get_current_ms(mqtt_client->packetTickCntr, &current_ms) != 0)
             {
                 LOG(LOG_ERROR, LOG_LINE, "Error: tickcounter_get_current_ms failed");