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/dns.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/dns.c')
| -rw-r--r-- | src/or/dns.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/dns.c b/src/or/dns.c index 56f7378982..17bb58c594 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -547,7 +547,8 @@ static void dns_found_answer(char *address, uint32_t addr, char outcome) { /** Write handler: called when we've pushed a request to a dnsworker. */ int connection_dns_finished_flushing(connection_t *conn) { - tor_assert(conn && conn->type == CONN_TYPE_DNSWORKER); + tor_assert(conn); + tor_assert(conn->type == CONN_TYPE_DNSWORKER); connection_stop_writing(conn); return 0; } @@ -560,7 +561,8 @@ int connection_dns_process_inbuf(connection_t *conn) { char success; uint32_t addr; - tor_assert(conn && conn->type == CONN_TYPE_DNSWORKER); + tor_assert(conn); + tor_assert(conn->type == CONN_TYPE_DNSWORKER); if(conn->inbuf_reached_eof) { log_fn(LOG_WARN,"Read eof. Worker died unexpectedly."); |