[tor-commits] [tor/master] Consistently use braced blocks in hibernate_go_dormant()

nickm at torproject.org nickm at torproject.org
Tue Oct 31 15:59:44 UTC 2017


commit e9f57e193d75f5c61b05dafb1c1585e5b1762866
Author: teor <teor2345 at gmail.com>
Date:   Tue Sep 19 14:18:25 2017 +1000

    Consistently use braced blocks in hibernate_go_dormant()
---
 src/or/hibernate.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index e60306a73..558180b45 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -907,20 +907,23 @@ hibernate_go_dormant(time_t now)
   while ((conn = connection_get_by_type(CONN_TYPE_OR)) ||
          (conn = connection_get_by_type(CONN_TYPE_AP)) ||
          (conn = connection_get_by_type(CONN_TYPE_EXIT))) {
-    if (CONN_IS_EDGE(conn))
+    if (CONN_IS_EDGE(conn)) {
       connection_edge_end(TO_EDGE_CONN(conn), END_STREAM_REASON_HIBERNATING);
+    }
     log_info(LD_NET,"Closing conn type %d", conn->type);
-    if (conn->type == CONN_TYPE_AP) /* send socks failure if needed */
+    if (conn->type == CONN_TYPE_AP) {
+      /* send socks failure if needed */
       connection_mark_unattached_ap(TO_ENTRY_CONN(conn),
                                     END_STREAM_REASON_HIBERNATING);
-    else if (conn->type == CONN_TYPE_OR) {
+    } else if (conn->type == CONN_TYPE_OR) {
       if (TO_OR_CONN(conn)->chan) {
         connection_or_close_normally(TO_OR_CONN(conn), 0);
       } else {
          connection_mark_for_close(conn);
       }
-    } else
+    } else {
       connection_mark_for_close(conn);
+    }
   }
 
   if (now < interval_wakeup_time)





More information about the tor-commits mailing list