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/rendservice.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/rendservice.c')
| -rw-r--r-- | src/or/rendservice.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 2c86b4385f..028c2010dc 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -508,7 +508,8 @@ rend_service_relaunch_rendezvous(circuit_t *oldcirc) } oldstate = oldcirc->build_state; newstate = newcirc->build_state; - tor_assert(newstate && oldstate); + tor_assert(newstate); + tor_assert(oldstate); newstate->failure_count = oldstate->failure_count+1; newstate->pending_final_cpath = oldstate->pending_final_cpath; oldstate->pending_final_cpath = NULL; @@ -556,7 +557,8 @@ rend_service_intro_has_opened(circuit_t *circuit) char serviceid[REND_SERVICE_ID_LEN+1]; tor_assert(circuit->purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO); - tor_assert(CIRCUIT_IS_ORIGIN(circuit) && circuit->cpath); + tor_assert(CIRCUIT_IS_ORIGIN(circuit)); + tor_assert(circuit->cpath); base32_encode(serviceid, REND_SERVICE_ID_LEN+1, circuit->rend_pk_digest,10); |