From: David Goulet <dgoulet@torproject.org>
Date: Fri, 15 Sep 2017 13:25:04 +0000 (-0400)
Subject: sched: Revert IF_BUG_ONCE() to tor_assert()
X-Git-Tag: tor-0.3.2.1-alpha~31^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=513d642a66b49f02143ec788bd699e5e9c81b4b3;p=thirdparty%2Ftor.git

sched: Revert IF_BUG_ONCE() to tor_assert()

Signed-off-by: David Goulet <dgoulet@torproject.org>
---

diff --git a/src/or/scheduler.c b/src/or/scheduler.c
index e2466c01a1..4a9f3dcaf6 100644
--- a/src/or/scheduler.c
+++ b/src/or/scheduler.c
@@ -224,19 +224,12 @@ scheduler_compare_channels, (const void *c1_v, const void *c2_v))
   const circuitmux_policy_t *p1, *p2;
   uintptr_t p1_i, p2_i;
 
+  tor_assert(c1_v);
+  tor_assert(c2_v);
+
   c1 = (const channel_t *)(c1_v);
   c2 = (const channel_t *)(c2_v);
 
-  IF_BUG_ONCE(!c1 || !c2) {
-    if (c1 && !c2) {
-      return -1;
-    } else if (c2 && !c1) {
-      return 1;
-    } else {
-      return -1;
-    }
-  }
-
   if (c1 != c2) {
     if (circuitmux_get_policy(c1->cmux) ==
         circuitmux_get_policy(c2->cmux)) {