[or-cvs] [tor/master 3/9] Add some braces to make arma happy

nickm at torproject.org nickm at torproject.org
Wed Sep 15 02:17:39 UTC 2010


Author: Nick Mathewson <nickm at torproject.org>
Date: Wed, 18 Aug 2010 11:28:51 -0400
Subject: Add some braces to make arma happy
Commit: 5063a1c538739e56a38605b2d8ddba3164e1aa73

---
 src/or/dirserv.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 7b469ce..4d4d8a2 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -935,21 +935,22 @@ dirserv_set_router_is_running(routerinfo_t *router, time_t now)
    */
   int answer;
 
-  if (router_is_me(router))
+  if (router_is_me(router)) {
     /* We always know if we are down ourselves. */
     answer = ! we_are_hibernating();
-  else if (router->is_hibernating &&
-           router->cache_info.published_on > router->last_reachable)
+  } else if (router->is_hibernating &&
+             router->cache_info.published_on > router->last_reachable) {
     /* A hibernating router is down unless we (somehow) had contact with it
      * since it declared itself to be hibernating. */
     answer = 0;
-  else if (get_options()->AssumeReachable)
+  } else if (get_options()->AssumeReachable) {
     /* If AssumeReachable, everybody is up! */
     answer = 1;
-  else
+  } else {
     /* Otherwise, a router counts as up if we found it reachable in the last
        REACHABLE_TIMEOUT seconds. */
     answer = (now < router->last_reachable + REACHABLE_TIMEOUT);
+  }
 
   if (!answer && running_long_enough_to_decide_unreachable()) {
     /* not considered reachable. tell rephist. */
-- 
1.7.1




More information about the tor-commits mailing list