Replace all FREE_AND_NULL* uses to take a type and a free function.

This commit was made mechanically by this perl script:

\#!/usr/bin/perl -w -i -p

next if /^#define FREE_AND_NULL/;
s/\bFREE_AND_NULL\((\w+),/FREE_AND_NULL\(${1}_t, ${1}_free_,/;
s/\bFREE_AND_NULL_UNMATCHED\(/FREE_AND_NULL\(/;

1 files changed, 3 insertions, 3 deletions

diff --git a/src/or/channel.h b/src/or/channel.h
index 0ee99dcaff..1ff226d374 100644
--- a/src/or/channel.h
+++ b/src/or/channel.h
@@ -517,9 +517,9 @@ void channel_listener_closed(channel_listener_t *chan_l);
 
 /* Free a channel */
 void channel_free_(channel_t *chan);
-#define channel_free(chan) FREE_AND_NULL(channel, (chan))
+#define channel_free(chan) FREE_AND_NULL(channel_t, channel_free_, (chan))
 void channel_listener_free_(channel_listener_t *chan_l);
-#define channel_listener_free(chan_l) FREE_AND_NULL(channel_listener, (chan_l))
+#define channel_listener_free(chan_l) FREE_AND_NULL(channel_listener_t, channel_listener_free_, (chan_l))
 
 /* State/metadata setters */
 
@@ -722,7 +722,7 @@ int packed_cell_is_destroy(channel_t *chan,
 /* Declare the handle helpers */
 HANDLE_DECL(channel, channel_s,)
 #define channel_handle_free(h)    \
-  FREE_AND_NULL(channel_handle, (h))
+  FREE_AND_NULL(channel_handle_t, channel_handle_free_, (h))
 
 #endif /* !defined(TOR_CHANNEL_H) */