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/cpuworker.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/cpuworker.c')
-rw-r--r-- | src/or/cpuworker.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 6abcab5d9a..1d6eee4bd9 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -48,7 +48,8 @@ void cpu_init(void) { /** Called when we're done sending a request to a cpuworker. */ int connection_cpu_finished_flushing(connection_t *conn) { - tor_assert(conn && conn->type == CONN_TYPE_CPUWORKER); + tor_assert(conn); + tor_assert(conn->type == CONN_TYPE_CPUWORKER); connection_stop_writing(conn); return 0; } @@ -104,7 +105,8 @@ int connection_cpu_process_inbuf(connection_t *conn) { connection_t *p_conn; circuit_t *circ; - tor_assert(conn && conn->type == CONN_TYPE_CPUWORKER); + tor_assert(conn); + tor_assert(conn->type == CONN_TYPE_CPUWORKER); if(conn->inbuf_reached_eof) { log_fn(LOG_WARN,"Read eof. Worker died unexpectedly."); |