Mercurial > hg > nginx

comparison src/core/ngx_rbtree.c @ 852:629b5e4f8931

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change variable name
author Igor Sysoev <igor@sysoev.ru>
date Thu, 16 Nov 2006 15:15:16 +0000
parents 4390fcad6628
children a7c8cbb4c55f
comparison
equal deleted inserted replaced
851:7b8692910220 852:629b5e4f8931
145 145
146 void 146 void
147 ngx_rbtree_delete(ngx_thread_volatile ngx_rbtree_t *tree, 147 ngx_rbtree_delete(ngx_thread_volatile ngx_rbtree_t *tree,
148 ngx_rbtree_node_t *node) 148 ngx_rbtree_node_t *node)
149 { 149 {
150 ngx_int_t is_red; 150 ngx_int_t red;
151 ngx_rbtree_node_t **root, *sentinel, *subst, *temp, *w; 151 ngx_rbtree_node_t **root, *sentinel, *subst, *temp, *w;
152 152
153 /* a binary tree delete */ 153 /* a binary tree delete */
154 154
155 root = (ngx_rbtree_node_t **) &tree->root; 155 root = (ngx_rbtree_node_t **) &tree->root;
184 node->key = 0; 184 node->key = 0;
185 185
186 return; 186 return;
187 } 187 }
188 188
189 is_red = ngx_rbt_is_red(subst); 189 red = ngx_rbt_is_red(subst);
190 190
191 if (subst == subst->parent->left) { 191 if (subst == subst->parent->left) {
192 subst->parent->left = temp; 192 subst->parent->left = temp;
193 193
194 } else { 194 } else {
237 node->right = NULL; 237 node->right = NULL;
238 node->parent = NULL; 238 node->parent = NULL;
239 node->key = 0; 239 node->key = 0;
240 } 240 }
241 241
242 if (is_red) { 242 if (red) {
243 return; 243 return;
244 } 244 }
245 245
246 /* a delete fixup */ 246 /* a delete fixup */
247 247