aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitlist.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/circuitlist.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/circuitlist.h')
-rw-r--r--src/or/circuitlist.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h
index 5d0da15ca8..ffa250b2c5 100644
--- a/src/or/circuitlist.h
+++ b/src/or/circuitlist.h
@@ -81,7 +81,8 @@ MOCK_DECL(void, channel_note_destroy_not_pending,
smartlist_t *circuit_find_circuits_to_upgrade_from_guard_wait(void);
#ifdef CIRCUITLIST_PRIVATE
-STATIC void circuit_free(circuit_t *circ);
+STATIC void circuit_free_(circuit_t *circ);
+#define circuit_free(circ) FREE_AND_NULL(circuit, (circ))
STATIC size_t n_cells_in_circ_queues(const circuit_t *c);
STATIC uint32_t circuit_max_queued_data_age(const circuit_t *c, uint32_t now);
STATIC uint32_t circuit_max_queued_cell_age(const circuit_t *c, uint32_t now);