From: Vladimir Homutov <vl@nginx.com>
Date: Mon, 30 Sep 2019 13:39:20 +0000 (+0300)
Subject: Core: removed dead code in ngx_rbtree_delete().
X-Git-Tag: release-1.17.5~11
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=f7999fe6893fec58332357c12eeb02f39589b894;p=nginx.git

Core: removed dead code in ngx_rbtree_delete().

The result of ngx_rbtree_min() is always a node with the left child equal to
sentinel, thus the check is unnecessary.
---

diff --git a/src/core/ngx_rbtree.c b/src/core/ngx_rbtree.c
index 969d549c8..377b82fcc 100644
--- a/src/core/ngx_rbtree.c
+++ b/src/core/ngx_rbtree.c
@@ -174,12 +174,7 @@ ngx_rbtree_delete(ngx_rbtree_t *tree, ngx_rbtree_node_t *node)
 
     } else {
         subst = ngx_rbtree_min(node->right, sentinel);
-
-        if (subst->left != sentinel) {
-            temp = subst->left;
-        } else {
-            temp = subst->right;
-        }
+        temp = subst->right;
     }
 
     if (subst == *root) {