commit a740994c771b5a4ecfba6a9f6f6fc57758a4b9f8 Author: Nick Mathewson nickm@torproject.org Date: Thu May 5 21:56:52 2011 -0400

Fix check-spaces issues in master --- src/or/directory.c | 5 +++-- src/or/microdesc.c | 1 + src/or/routerlist.c | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c index 184a6b4..145de3d 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1632,13 +1632,14 @@ connection_dir_client_reached_eof(dir_connection_t *conn) if (status_code == 503) { routerstatus_t *rs; trusted_dir_server_t *ds; + const char *id_digest = conn->identity_digest; log_info(LD_DIR,"Received http status code %d (%s) from server " "'%s:%d'. I'll try again soon.", status_code, escaped(reason), conn->_base.address, conn->_base.port); - if ((rs = router_get_mutable_consensus_status_by_id(conn->identity_digest))) + if ((rs = router_get_mutable_consensus_status_by_id(id_digest))) rs->last_dir_503_at = now; - if ((ds = router_get_trusteddirserver_by_digest(conn->identity_digest))) + if ((ds = router_get_trusteddirserver_by_digest(id_digest))) ds->fake_status.last_dir_503_at = now;

tor_free(body); tor_free(headers); tor_free(reason); diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 9db17cc..68b89ed 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -698,3 +698,4 @@ usable_consensus_flavor(void) return FLAV_NS; } } + diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 95b91c8..04f4214 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4899,7 +4899,7 @@ count_usable_descriptors(int *num_present, int *num_usable, int present; ++*num_usable; /* the consensus says we want it. */ if (md) - present = NULL != (microdesc_cache_lookup_by_digest256(NULL, digest)); + present = NULL != microdesc_cache_lookup_by_digest256(NULL, digest); else present = NULL != router_get_by_descriptor_digest(digest); if (present) { @@ -4922,7 +4922,7 @@ count_loading_descriptors_progress(void) int num_present = 0, num_usable=0; time_t now = time(NULL); const networkstatus_t *consensus = - networkstatus_get_reasonably_live_consensus(now, usable_consensus_flavor()); + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); double fraction;

if (!consensus) @@ -4952,7 +4952,7 @@ update_router_have_minimum_dir_info(void) int res; or_options_t *options = get_options(); const networkstatus_t *consensus = - networkstatus_get_reasonably_live_consensus(now, usable_consensus_flavor()); + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor());

if (!consensus) { if (!networkstatus_get_latest_consensus())