Move #9731 checks to start of their functions

At arma's suggestion.

diff --git a/src/or/connection.c b/src/or/connection.c
index 43ec43f43b04bba6f69a0210bd7387e5119bf032..210c6582bb12bedf1cf65e378128ebc71c786d73 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -2684,6 +2684,9 @@ connection_consider_empty_read_buckets(connection_t *conn)
 {
   const char *reason;
 
+  if (!connection_is_rate_limited(conn))
+    return; /* Always okay. */
+
   if (global_read_bucket <= 0) {
     reason = "global read bucket exhausted. Pausing.";
   } else if (connection_counts_as_relayed_traffic(conn, approx_time()) &&
@@ -2696,9 +2699,6 @@ connection_consider_empty_read_buckets(connection_t *conn)
   } else
     return; /* all good, no need to stop it */
 
-  if (!connection_is_rate_limited(conn))
-    return; /* Always okay. */
-
   LOG_FN_CONN(conn, (LOG_DEBUG, LD_NET, "%s", reason));
   conn->read_blocked_on_bw = 1;
   connection_stop_reading(conn);