Diff: Socket/TCPSocketConnection.cpp

Revision:

9:9f0578ff157a

Parent:

7:fded23f50479

Child:

11:75cf1e1c921c

--- a/Socket/TCPSocketConnection.cpp	Fri Oct 07 00:36:47 2016 +0000
+++ b/Socket/TCPSocketConnection.cpp	Fri Oct 07 13:26:00 2016 +0000
@@ -36,8 +36,7 @@
     _is_blocking = blocking;   // true if we want to wait for request
     _btimeout = timeout;       // user specs msec
 
-    if( WNCInterface::_pwnc->getWncStatus() == FATAL_FLAG )
-        FATAL_WNC_ERROR(void);
+    CHK_WNCFE(( WNCInterface::_pwnc->getWncStatus() == FATAL_FLAG ), void);
     M_LOCK;
     WNCInterface::_pwnc->setReadRetryWait(0, 0);
     WNCInterface::_pwnc->setReadRetries(0, 0);
@@ -60,8 +59,7 @@
     
     WncController_fk::WncController::WncState_e s = WNCInterface::_pwnc->getWncStatus();
 
-    if( s == FATAL_FLAG )
-        FATAL_WNC_ERROR(fail);
+    CHK_WNCFE(( s == FATAL_FLAG ), fail);
  
     if( s == WncController_fk::WncController::WNC_ON ) {
       M_LOCK;
@@ -78,10 +76,7 @@
     int ret=-1;
     WncController_fk::WncController::WncState_e s = WNCInterface::_pwnc->getWncStatus();
 
-    if( s  == FATAL_FLAG )
-        FATAL_WNC_ERROR(fail);
- 
-
+    CHK_WNCFE(( s  == FATAL_FLAG ), fail);
     if( s != WncController_fk::WncController::WNC_ON )
         return ret;