diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-10-16 22:14:52 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-10-16 22:14:52 +0000 |
| commit | de65052312ff9ddd86e492985008bd5ca61d7aa9 (patch) | |
| tree | 96a2b81c47b4e35e465aa01d8328517a1525d752 /src/or/circuituse.c | |
| parent | 25a046df7422560b16dfdb302df9621309d5fa77 (diff) | |
| download | tor-de65052312ff9ddd86e492985008bd5ca61d7aa9.tar.gz tor-de65052312ff9ddd86e492985008bd5ca61d7aa9.zip | |
don't assert multiple things in the same tor_assert()
svn:r2544
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 057a2a85a5..9ce848038f 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -331,7 +331,8 @@ void circuit_build_needed_circs(time_t now) { void circuit_detach_stream(circuit_t *circ, connection_t *conn) { connection_t *prevconn; - tor_assert(circ && conn); + tor_assert(circ); + tor_assert(conn); conn->cpath_layer = NULL; /* make sure we don't keep a stale pointer */ @@ -738,7 +739,9 @@ static void link_apconn_to_circ(connection_t *apconn, circuit_t *circ) { /* assert_connection_ok(conn, time(NULL)); */ circ->p_streams = apconn; - tor_assert(CIRCUIT_IS_ORIGIN(circ) && circ->cpath && circ->cpath->prev); + tor_assert(CIRCUIT_IS_ORIGIN(circ)); + tor_assert(circ->cpath); + tor_assert(circ->cpath->prev); tor_assert(circ->cpath->prev->state == CPATH_STATE_OPEN); apconn->cpath_layer = circ->cpath->prev; } |