StreamSocketSink: port to DebugError

flow/StreamSocketSink.c

@@ -26,16 +26,7 @@
 
 static void report_error (StreamSocketSink *s, int error)
 {
-    #ifndef NDEBUG
-    DEAD_ENTER(s->d_dead)
-    #endif
-    
-    FlowErrorReporter_ReportError(&s->rep, &error);
-    
-    #ifndef NDEBUG
-    ASSERT(DEAD_KILLED)
-    DEAD_LEAVE(s->d_dead);
-    #endif
+    DEBUGERROR(&s->d_err, FlowErrorReporter_ReportError(&s->rep, &error))
 }
 
 static void try_send (StreamSocketSink *s)
@@ -104,16 +95,12 @@ void StreamSocketSink_Init (StreamSocketSink *s, FlowErrorReporter rep, BSocket
     s->in_len = -1;
     
     DebugObject_Init(&s->d_obj);
-    #ifndef NDEBUG
-    DEAD_INIT(s->d_dead);
-    #endif
+    DebugError_Init(&s->d_err);
 }
 
 void StreamSocketSink_Free (StreamSocketSink *s)
 {
-    #ifndef NDEBUG
-    DEAD_KILL(s->d_dead);
-    #endif
+    DebugError_Free(&s->d_err);
     DebugObject_Free(&s->d_obj);
     
     // free input

flow/StreamSocketSink.h

@@ -29,7 +29,7 @@
 
 #include <stdint.h>
 
-#include <misc/dead.h>
+#include <misc/debugerror.h>
 #include <system/DebugObject.h>
 #include <system/BSocket.h>
 #include <flow/StreamPassInterface.h>
@@ -47,9 +47,7 @@ typedef struct {
     int in_len;
     uint8_t *in;
     DebugObject d_obj;
-    #ifndef NDEBUG
-    dead_t d_dead;
-    #endif
+    DebugError d_err;
 } StreamSocketSink;
 
 /**