aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-12-11 20:28:50 +0000
committerNick Mathewson <nickm@torproject.org>2008-12-11 20:28:50 +0000
commit04ec7d1f9807c772349328947a1df861c28b414e (patch)
tree3693a95f33362bec09c6b17f312a9ec61bd21a5a /src/or/connection.c
parent4277b0e9265ca24d324e210ded904f1588b24df1 (diff)
downloadtor-04ec7d1f9807c772349328947a1df861c28b414e.tar.gz
tor-04ec7d1f9807c772349328947a1df861c28b414e.zip
Now that tor_assert is no longer using a broken force-to-boolean formulation, we can tor_assert a bitfield without a gcc compile error.
svn:r17598
Diffstat (limited to 'src/or/connection.c')
-rw-r--r--src/or/connection.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index b27e8d26b2..7a6a83a265 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -2979,7 +2979,7 @@ assert_connection_ok(connection_t *conn, time_t now)
if (conn->linked_conn) {
tor_assert(conn->linked_conn->linked_conn == conn);
- tor_assert(conn->linked != 0);
+ tor_assert(conn->linked);
}
if (conn->linked)
tor_assert(conn->s < 0);
@@ -3030,7 +3030,7 @@ assert_connection_ok(connection_t *conn, time_t now)
tor_assert(edge_conn->socks_request);
if (conn->state == AP_CONN_STATE_OPEN) {
- tor_assert(edge_conn->socks_request->has_finished != 0);
+ tor_assert(edge_conn->socks_request->has_finished);
if (!conn->marked_for_close) {
tor_assert(edge_conn->cpath_layer);
assert_cpath_layer_ok(edge_conn->cpath_layer);