From cf156caaa55f75729b726dee4f427e2416672225 Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Fri, 29 May 2020 12:35:09 -0500 Subject: [PATCH] cc smarter than bb --- src/lib/server/trunk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/server/trunk.c b/src/lib/server/trunk.c index f4a6231d4f..39d524d986 100644 --- a/src/lib/server/trunk.c +++ b/src/lib/server/trunk.c @@ -677,6 +677,7 @@ do { \ /** Reorder the connections in the active heap * + * fr_heap_extract will also error out if heap_id is bad - no need for assert */ #define CONN_REORDER(_tconn) \ do { \ @@ -684,7 +685,7 @@ do { \ if ((fr_heap_num_elements((_tconn)->pub.trunk->active) == 1)) break; \ if (!fr_cond_assert((_tconn)->pub.state == FR_TRUNK_CONN_ACTIVE)) break; \ _ret = fr_heap_extract((_tconn)->pub.trunk->active, (_tconn)); \ - if (!fr_cond_assert_msg(_ret == 0, "Failed extracting conn from active heap: %s", fr_strerror())) break; \ /* Will also error out if heap_id is bad - no need for assert */ + if (!fr_cond_assert_msg(_ret == 0, "Failed extracting conn from active heap: %s", fr_strerror())) break; \ fr_heap_insert((_tconn)->pub.trunk->active, (_tconn)); \ } while (0) -- 2.47.3