Use FREE_AND_NULL with conflux_msg_t.

diff --git a/src/core/or/conflux.c b/src/core/or/conflux.c
index b657eb00ef378293f009371e8186c38378e737a6..c444f690dc0d17dd1ae4e6035d48e797f243dc96 100644 (file)
--- a/src/core/or/conflux.c
+++ b/src/core/or/conflux.c
@@ -917,7 +917,7 @@ conflux_dequeue_relay_msg(conflux_t *cfx)
 
 /** Free a given conflux msg object. */
 void
-conflux_relay_msg_free(conflux_msg_t *msg)
+conflux_relay_msg_free_(conflux_msg_t *msg)
 {
   if (msg) {
     relay_msg_free(msg->msg);

diff --git a/src/core/or/conflux.h b/src/core/or/conflux.h
index 1594039e2642a32a1f61257e1874019b54a8faf9..ecb47707c266b333f50a2d9e7151c5159d597119 100644 (file)
--- a/src/core/or/conflux.h
+++ b/src/core/or/conflux.h
@@ -63,7 +63,9 @@ bool conflux_process_relay_msg(conflux_t *cfx, circuit_t *in_circ,
 conflux_msg_t *conflux_dequeue_relay_msg(conflux_t *cfx);
 void conflux_note_cell_sent(conflux_t *cfx, circuit_t *circ,
                             uint8_t relay_command);
-void conflux_relay_msg_free(conflux_msg_t *msg);
+void conflux_relay_msg_free_(conflux_msg_t *msg);
+#define conflux_relay_msg_free(msg) \
+  FREE_AND_NULL(conflux_msg_t, conflux_relay_msg_free_, (msg))
 
 /* Private section starts. */
 #ifdef TOR_CONFLUX_PRIVATE