aboutsummaryrefslogtreecommitdiff
path: root/src/or/channel.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-21 08:29:42 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-08 14:47:19 -0500
commitb0cc9856ee560865d2668afbff20e8b77986e4ee (patch)
tree3411bb448b33a9f256020784e28aa62fe338b14d /src/or/channel.h
parentc92ac9f5cbb4440b5f87c7e0dd6bec5147d72405 (diff)
downloadtor-b0cc9856ee560865d2668afbff20e8b77986e4ee.tar.gz
tor-b0cc9856ee560865d2668afbff20e8b77986e4ee.zip
Update free functions into macros: src/or/ part 1
This covers addressmap.h (no change needed) through confparse.h
Diffstat (limited to 'src/or/channel.h')
-rw-r--r--src/or/channel.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/channel.h b/src/or/channel.h
index e23d707915..0ee99dcaff 100644
--- a/src/or/channel.h
+++ b/src/or/channel.h
@@ -516,8 +516,10 @@ void channel_listener_close_for_error(channel_listener_t *chan_l);
void channel_listener_closed(channel_listener_t *chan_l);
/* Free a channel */
-void channel_free(channel_t *chan);
-void channel_listener_free(channel_listener_t *chan_l);
+void channel_free_(channel_t *chan);
+#define channel_free(chan) FREE_AND_NULL(channel, (chan))
+void channel_listener_free_(channel_listener_t *chan_l);
+#define channel_listener_free(chan_l) FREE_AND_NULL(channel_listener, (chan_l))
/* State/metadata setters */