Commit 5b48fbda authored by Ian Craggs's avatar Ian Craggs

Remove unneeded debugging statements

parent fa68280d
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
#define URI_TCP "tcp://" #define URI_TCP "tcp://"
#define BUILD_TIMESTAMP "201403121114" #define BUILD_TIMESTAMP "##MQTTCLIENT_BUILD_TAG##"
#define CLIENT_VERSION "1.0.0.2" #define CLIENT_VERSION "##MQTTCLIENT_VERSION_TAG##"
char* client_timestamp_eye = "MQTTAsyncV3_Timestamp " BUILD_TIMESTAMP; char* client_timestamp_eye = "MQTTAsyncV3_Timestamp " BUILD_TIMESTAMP;
char* client_version_eye = "MQTTAsyncV3_Version " CLIENT_VERSION; char* client_version_eye = "MQTTAsyncV3_Version " CLIENT_VERSION;
...@@ -2570,8 +2570,6 @@ int MQTTAsync_connecting(MQTTAsyncs* m) ...@@ -2570,8 +2570,6 @@ int MQTTAsync_connecting(MQTTAsyncs* m)
#endif #endif
exit: exit:
if (rc == TCPSOCKET_INTERRUPTED)
printf("Interrupted connect encountered****\n");
if ((rc != 0 && rc != TCPSOCKET_INTERRUPTED && m->c->connect_state != 2) || (rc == SSL_FATAL)) if ((rc != 0 && rc != TCPSOCKET_INTERRUPTED && m->c->connect_state != 2) || (rc == SSL_FATAL))
{ {
if (MQTTAsync_checkConn(&m->connect)) if (MQTTAsync_checkConn(&m->connect))
...@@ -2651,7 +2649,7 @@ MQTTPacket* MQTTAsync_cycle(int* sock, unsigned long timeout, int* rc) ...@@ -2651,7 +2649,7 @@ MQTTPacket* MQTTAsync_cycle(int* sock, unsigned long timeout, int* rc)
pack = MQTTPacket_Factory(&m->c->net, rc); pack = MQTTPacket_Factory(&m->c->net, rc);
if ((m->c->connect_state == 3) && (*rc == SOCKET_ERROR)) if ((m->c->connect_state == 3) && (*rc == SOCKET_ERROR))
{ {
Log(LOG_ERROR, -1, "CONNECT sent but MQTTPacket_Factory has returned SOCKET_ERROR"); Log(TRACE_MINIMUM, -1, "CONNECT sent but MQTTPacket_Factory has returned SOCKET_ERROR");
if (MQTTAsync_checkConn(&m->connect)) if (MQTTAsync_checkConn(&m->connect))
{ {
MQTTAsync_queuedCommand* conn; MQTTAsync_queuedCommand* conn;
......
...@@ -744,7 +744,6 @@ int SSLSocket_putdatas(SSL* ssl, int socket, char* buf0, int buf0len, int count, ...@@ -744,7 +744,6 @@ int SSLSocket_putdatas(SSL* ssl, int socket, char* buf0, int buf0len, int count,
ListAppend(s.write_pending, sockmem, sizeof(int)); ListAppend(s.write_pending, sockmem, sizeof(int));
FD_SET(socket, &(s.pending_wset)); FD_SET(socket, &(s.pending_wset));
rc = TCPSOCKET_INTERRUPTED; rc = TCPSOCKET_INTERRUPTED;
//iovec.iov_base = NULL; /* don't free it because it hasn't been completely written yet */
} }
else else
rc = SOCKET_ERROR; rc = SOCKET_ERROR;
...@@ -753,9 +752,10 @@ int SSLSocket_putdatas(SSL* ssl, int socket, char* buf0, int buf0len, int count, ...@@ -753,9 +752,10 @@ int SSLSocket_putdatas(SSL* ssl, int socket, char* buf0, int buf0len, int count,
if (rc != TCPSOCKET_INTERRUPTED) if (rc != TCPSOCKET_INTERRUPTED)
free(iovec.iov_base); free(iovec.iov_base);
if (rc == TCPSOCKET_INTERRUPTED) else
{ {
int i; int i;
free(buf0);
for (i = 0; i < count; ++i) for (i = 0; i < count; ++i)
{ {
if (frees[i]) if (frees[i])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment