Diff: internal/types/QueuedCommand.cpp

Revision:

6:8a87a59d0d21

Parent:

1:6ec9998427ad

Child:

8:1fad4ca6c6a4

--- a/internal/types/QueuedCommand.cpp	Mon Aug 11 04:00:39 2014 -0700
+++ b/internal/types/QueuedCommand.cpp	Mon Aug 11 13:55:07 2014 -0700
@@ -8,10 +8,9 @@
  * written permission of ACKme Networks.
  */
 
-#include <assert.h>
 
 #include "Wiconnect.h"
-
+#include "internal/common.h"
 
 /*************************************************************************************************/
 QueuedCommand::QueuedCommand(int responseBufferLen_, char *responseBuffer_, int timeoutMs_, const ReaderFunc &reader_, void *user_, const char *cmd_, va_list vaList)
@@ -123,14 +122,16 @@
 /*************************************************************************************************/
 void* QueuedCommand::operator new(size_t size)
 {
-    assert(Wiconnect::getInstance()->_malloc != NULL);
+    Wiconnect *wiconnect = Wiconnect::getInstance();
+    wiconnect_assert(wiconnect, "QueuedCommand:new malloc not defined", wiconnect->_malloc != NULL);
     return Wiconnect::getInstance()->_malloc(size);
 }
 
 /*************************************************************************************************/
 void QueuedCommand::operator delete(void* ptr)
 {
-    assert(Wiconnect::getInstance()->_free != NULL);
+    Wiconnect *wiconnect = Wiconnect::getInstance();
+    wiconnect_assert(wiconnect, "QueuedCommand:delete free not defined", wiconnect->_free != NULL);
     Wiconnect::getInstance()->_free(ptr);
 }
 
@@ -140,17 +141,19 @@
     if(responseBufferLen_ > 0)
     {
 #ifdef WICONNECT_ENABLE_MALLOC
+        Wiconnect *wiconnect = Wiconnect::getInstance();
         allocatedBuffer = false;
         if(responseBuffer_ == NULL)
         {
-            assert(Wiconnect::getInstance()->_malloc != NULL);
-            responseBuffer = (char*)Wiconnect::getInstance()->_malloc(responseBufferLen_);
+            wiconnect_assert(wiconnect, "QueuedCommand() malloc not defined", wiconnect->_malloc != NULL);
+            responseBuffer = (char*)wiconnect->_malloc(responseBufferLen_);
+            wiconnect_assert(wiconnect, "QueuedCommand() responseBuffer malloc failed", responseBuffer != NULL);
             allocatedBuffer = true;
         }
         else
 #endif
         {
-            assert(responseBuffer_ != NULL);
+            wiconnect_assert(wiconnect, "QueuedCommand(), null buffer", responseBuffer_ != NULL);
             responseBuffer = responseBuffer_;
         }
     }