diff options
author | Roger Dingledine <arma@torproject.org> | 2007-04-30 04:00:06 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2007-04-30 04:00:06 +0000 |
commit | 2d56d883c2fc047fe30c4841651f106fdc16a5d7 (patch) | |
tree | ec77fb9f466849505f141618f7c4c2be37fccf20 /src | |
parent | 105d7821098b823c9ff75f6833a861eb313f2289 (diff) | |
download | tor-2d56d883c2fc047fe30c4841651f106fdc16a5d7.tar.gz tor-2d56d883c2fc047fe30c4841651f106fdc16a5d7.zip |
minor cleanups
svn:r10050
Diffstat (limited to 'src')
-rw-r--r-- | src/or/or.h | 6 | ||||
-rw-r--r-- | src/or/relay.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/or/or.h b/src/or/or.h index ed89e5cc88..32b7288357 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -801,10 +801,10 @@ typedef struct connection_t { struct connection_t *linked_conn; /* XXXX020 NM move these up to the other 1-bit flags. */ unsigned int linked:1; /**< True if there is, or has been, a linked_conn. */ - /** True iff we'd like to be notified about read events from the linked conn. - */ + /** True iff we'd like to be notified about read events from the + * linked conn. */ unsigned int reading_from_linked_conn:1; - /** True iff we're willing to write to the linked conn. */ + /** True iff we're willing to write to the linked conn. */ unsigned int writing_to_linked_conn:1; /** True iff we're currently able to read on the linked conn, and our * read_event should be made active with libevent. */ diff --git a/src/or/relay.c b/src/or/relay.c index a2058690d4..514f6210c0 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1497,7 +1497,6 @@ free_cell_pool(void) { /* Maybe we haven't called init_cell_pool yet; need to check for it. */ if (cell_pool) { - tor_assert(cell_pool); mp_pool_destroy(cell_pool); cell_pool = NULL; } |