diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-03-24 15:58:11 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-03-24 15:58:11 +0000 |
| commit | da6bd21b72153b84a4c6831467d956ddd86f2532 (patch) | |
| tree | 4d411800eb8f1c827ccf983332c77b41b0d491c0 /src/or/circuituse.c | |
| parent | 306d5400c367460936523f8417102f043a98fa78 (diff) | |
| download | tor-da6bd21b72153b84a4c6831467d956ddd86f2532.tar tor-da6bd21b72153b84a4c6831467d956ddd86f2532.tar.gz | |
r12644@0-41-wifi: nickm | 2007-03-23 16:02:23 -0400
Eliminate more redundant circuit_t arguments when edge_connection_t is already supplied and the circuit is already attached.
svn:r9900
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index cc26e42f2..fd0e609d2 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1183,11 +1183,11 @@ connection_ap_handshake_attach_chosen_circuit(edge_connection_t *conn, consider_recording_trackhost(conn, circ); /* fall through */ case SOCKS_COMMAND_CONNECT_DIR: - if (connection_ap_handshake_send_begin(conn, circ)<0) + if (connection_ap_handshake_send_begin(conn)<0) return -1; break; default: - if (connection_ap_handshake_send_resolve(conn, circ)<0) + if (connection_ap_handshake_send_resolve(conn)<0) return -1; } @@ -1286,7 +1286,7 @@ connection_ap_handshake_attach_circuit(edge_connection_t *conn) */ rendcirc->_base.timestamp_dirty = time(NULL); link_apconn_to_circ(conn, rendcirc); - if (connection_ap_handshake_send_begin(conn, rendcirc) < 0) + if (connection_ap_handshake_send_begin(conn) < 0) return 0; /* already marked, let them fade away */ return 1; } |