[tor-commits] [tor/master] Remove a needless if (1)

[nickm@xxxxxxxxxxxxxx]

commit f591a4d94cfa6a8ad17fd126e9736196b10a266a
Author: Arlo Breault <arlolra@xxxxxxxxx>
Date:   Tue Sep 23 12:14:41 2014 -0400

    Remove a needless if (1)
---
 src/or/directory.c |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c
index f8c4fbd..616f593 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -527,14 +527,11 @@ MOCK_IMPL(void, directory_get_from_dirserver, (uint8_t dir_purpose,
     }
   } else { /* get_via_tor */
     /* Never use fascistfirewall; we're going via Tor. */
-    if (1) {
-      /* anybody with a non-zero dirport will do. Disregard firewalls. */
-      pds_flags |= PDS_IGNORE_FASCISTFIREWALL;
-      rs = router_pick_directory_server(type, pds_flags);
-      /* If we have any hope of building an indirect conn, we know some router
-       * descriptors.  If (rs==NULL), we can't build circuits anyway, so
-       * there's no point in falling back to the authorities in this case. */
-    }
+    pds_flags |= PDS_IGNORE_FASCISTFIREWALL;
+    rs = router_pick_directory_server(type, pds_flags);
+    /* If we have any hope of building an indirect conn, we know some router
+     * descriptors.  If (rs==NULL), we can't build circuits anyway, so
+     * there's no point in falling back to the authorities in this case. */
   }
 
   if (rs) {



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits