summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-04-26 18:52:16 +0000
committerRoger Dingledine <arma@torproject.org>2005-04-26 18:52:16 +0000
commit509405a5f7643f94933ae7feb0a2788a73abd801 (patch)
tree7732760a74a902c247f746ebc52ccb97e54dc329 /src/or/main.c
parent5e86e87124e643108c827366daac878e708d935d (diff)
downloadtor-509405a5f7643f94933ae7feb0a2788a73abd801.tar.gz
tor-509405a5f7643f94933ae7feb0a2788a73abd801.zip
clean up this TOR_FRAGILE business
svn:r4116
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/or/main.c b/src/or/main.c
index d34770faa4..e2abfaeddc 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -356,9 +356,7 @@ conn_read_callback(int fd, short event, void *_conn)
#ifndef MS_WINDOWS
log_fn(LOG_WARN,"Bug: unhandled error on read for %s connection (fd %d); removing",
conn_type_to_string(conn->type), conn->s);
-#ifdef TOR_FRAGILE
- tor_assert(0);
-#endif
+ tor_fragile_assert();
#endif
if (CONN_IS_EDGE(conn))
connection_edge_end_errno(conn, conn->cpath_layer);
@@ -388,9 +386,7 @@ static void conn_write_callback(int fd, short events, void *_conn)
/* this connection is broken. remove it. */
log_fn(LOG_WARN,"Bug: unhandled error on write for %s connection (fd %d); removing",
conn_type_to_string(conn->type), conn->s);
-#ifdef TOR_FRAGILE
- tor_assert(0);
-#endif
+ tor_fragile_assert();
conn->has_sent_end = 1; /* otherwise we cry wolf about duplicate close */
/* XXX do we need a close-immediate here, so we don't try to flush? */
connection_mark_for_close(conn);