summaryrefslogtreecommitdiff
path: root/src/or/connection_or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-07 10:44:04 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-08 14:47:19 -0500
commit285632a61b4e4aeec07b26004396473e0d8f4a43 (patch)
treeec6b0363f3072ba5e5c13ac1fb7cb2fb3c44db50 /src/or/connection_or.h
parent95531ddfbfb6cb30760523d91fd4dfc966d2f6a5 (diff)
downloadtor-285632a61b4e4aeec07b26004396473e0d8f4a43.tar.gz
tor-285632a61b4e4aeec07b26004396473e0d8f4a43.zip
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\(/;
Diffstat (limited to 'src/or/connection_or.h')
-rw-r--r--src/or/connection_or.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection_or.h b/src/or/connection_or.h
index 107af491eb..986b8cec45 100644
--- a/src/or/connection_or.h
+++ b/src/or/connection_or.h
@@ -70,7 +70,7 @@ time_t connection_or_client_used(or_connection_t *conn);
MOCK_DECL(int, connection_or_get_num_circuits, (or_connection_t *conn));
void or_handshake_state_free_(or_handshake_state_t *state);
#define or_handshake_state_free(state) \
- FREE_AND_NULL(or_handshake_state, (state))
+ FREE_AND_NULL(or_handshake_state_t, or_handshake_state_free_, (state))
void or_handshake_state_record_cell(or_connection_t *conn,
or_handshake_state_t *state,
const cell_t *cell,
@@ -108,7 +108,7 @@ int var_cell_pack_header(const var_cell_t *cell, char *hdr_out,
var_cell_t *var_cell_new(uint16_t payload_len);
var_cell_t *var_cell_copy(const var_cell_t *src);
void var_cell_free_(var_cell_t *cell);
-#define var_cell_free(cell) FREE_AND_NULL(var_cell, (cell))
+#define var_cell_free(cell) FREE_AND_NULL(var_cell_t, var_cell_free_, (cell))
/* DOCDOC */
#define MIN_LINK_PROTO_FOR_WIDE_CIRC_IDS 4