Bläddra i källkod

SinglePacketSender: port to DebugError

ambrop7 15 år sedan
förälder
incheckning
adaa666328
2 ändrade filer med 5 tillägg och 20 borttagningar
  1. 3 16
      flow/SinglePacketSender.c
  2. 2 4
      flow/SinglePacketSender.h

+ 3 - 16
flow/SinglePacketSender.c

@@ -26,16 +26,7 @@
 
 static void call_handler (SinglePacketSender *o)
 {
-    #ifndef NDEBUG
-    DEAD_ENTER(o->d_dead)
-    #endif
-    
-    o->handler(o->user);
-    
-    #ifndef NDEBUG
-    ASSERT(DEAD_KILLED)
-    DEAD_LEAVE(o->d_dead);
-    #endif
+    DEBUGERROR(&o->d_err, o->handler(o->user));
 }
 
 static void output_handler_done (SinglePacketSender *o)
@@ -64,15 +55,11 @@ void SinglePacketSender_Init (SinglePacketSender *o, uint8_t *packet, int packet
     PacketPassInterface_Sender_Send(o->output, packet, packet_len);
     
     DebugObject_Init(&o->d_obj);
-    #ifndef NDEBUG
-    DEAD_INIT(o->d_dead);
-    #endif
+    DebugError_Init(&o->d_err);
 }
 
 void SinglePacketSender_Free (SinglePacketSender *o)
 {
-    #ifndef NDEBUG
-    DEAD_KILL(o->d_dead);
-    #endif
+    DebugError_Free(&o->d_err);
     DebugObject_Free(&o->d_obj);
 }

+ 2 - 4
flow/SinglePacketSender.h

@@ -29,7 +29,7 @@
 
 #include <stdint.h>
 
-#include <misc/dead.h>
+#include <misc/debugerror.h>
 #include <system/DebugObject.h>
 #include <flow/PacketPassInterface.h>
 
@@ -49,9 +49,7 @@ typedef struct {
     SinglePacketSender_handler handler;
     void *user;
     DebugObject d_obj;
-    #ifndef NDEBUG
-    dead_t d_dead;
-    #endif
+    DebugError d_err;
 } SinglePacketSender;
 
 /**