BSocksClient: port to DebugError

socksclient/BSocksClient.c

@@ -53,16 +53,7 @@ static void send_handler_done (BSocksClient *o);
 
 void report_error (BSocksClient *o, int error)
 {
-    #ifndef NDEBUG
-    DEAD_ENTER(o->d_dead)
-    #endif
-    
-    o->handler(o->user, error);
-    
-    #ifndef NDEBUG
-    ASSERT(DEAD_KILLED)
-    DEAD_LEAVE(o->d_dead);
-    #endif
+    DEBUGERROR(&o->d_err, o->handler(o->user, error))
 }
 
 void init_control_io (BSocksClient *o)
@@ -367,9 +358,7 @@ int BSocksClient_Init (BSocksClient *o, BAddr server_addr, BAddr dest_addr, BSoc
     o->state = STATE_CONNECTING;
     
     DebugObject_Init(&o->d_obj);
-    #ifndef NDEBUG
-    DEAD_INIT(o->d_dead);
-    #endif
+    DebugError_Init(&o->d_err);
     
     return 1;
     
@@ -381,9 +370,7 @@ fail0:
 
 void BSocksClient_Free (BSocksClient *o)
 {
-    #ifndef NDEBUG
-    DEAD_KILL(o->d_dead);
-    #endif
+    DebugError_Free(&o->d_err);
     DebugObject_Free(&o->d_obj);
     
     if (o->state == STATE_UP) {

socksclient/BSocksClient.h

@@ -30,7 +30,7 @@
 #include <stdint.h>
 
 #include <misc/debug.h>
-#include <misc/dead.h>
+#include <misc/debugerror.h>
 #include <misc/socks_proto.h>
 #include <system/DebugObject.h>
 #include <system/BSocket.h>
@@ -90,9 +90,7 @@ typedef struct {
         } up;
     };
     DebugObject d_obj;
-    #ifndef NDEBUG
-    dead_t d_dead;
-    #endif
+    DebugError d_err;
 } BSocksClient;
 
 int BSocksClient_Init (BSocksClient *o, BAddr server_addr, BAddr dest_addr, BSocksClient_handler handler, void *user, BReactor *reactor) WARN_UNUSED;