diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2003-12-19 12:45:27 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2003-12-19 12:45:27 +0000 |
| commit | 1cd1e2741ab83cd7e0816e8b8ff43b3668703ea6 (patch) | |
| tree | 6a7000dd1f33ce80dfb7ec3863a4de3002f5f772 /src/core/ngx_rbtree.c | |
| parent | e89c4581f4706187052671a8a40dda4fe3e3c391 (diff) | |
| download | nginx-1cd1e2741ab83cd7e0816e8b8ff43b3668703ea6.tar.gz nginx-1cd1e2741ab83cd7e0816e8b8ff43b3668703ea6.zip | |
nginx-0.0.1-2003-12-19-15:45:27 import
Diffstat (limited to 'src/core/ngx_rbtree.c')
| -rw-r--r-- | src/core/ngx_rbtree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/ngx_rbtree.c b/src/core/ngx_rbtree.c index dc605510e..683920b6e 100644 --- a/src/core/ngx_rbtree.c +++ b/src/core/ngx_rbtree.c @@ -123,7 +123,7 @@ void ngx_rbtree_insert(ngx_rbtree_t **root, ngx_rbtree_t *sentinel, void ngx_rbtree_delete(ngx_rbtree_t **root, ngx_rbtree_t *sentinel, ngx_rbtree_t *node) { - ngx_int_t red; + ngx_int_t is_red; ngx_rbtree_t *subst, *temp, *w; /* a binary tree delete */ @@ -152,7 +152,7 @@ void ngx_rbtree_delete(ngx_rbtree_t **root, ngx_rbtree_t *sentinel, return; } - red = ngx_rbt_is_red(subst); + is_red = ngx_rbt_is_red(subst); if (subst == subst->parent->left) { subst->parent->left = temp; @@ -199,7 +199,7 @@ void ngx_rbtree_delete(ngx_rbtree_t **root, ngx_rbtree_t *sentinel, } } - if (red) { + if (is_red) { return; } @@ -246,7 +246,7 @@ void ngx_rbtree_delete(ngx_rbtree_t **root, ngx_rbtree_t *sentinel, w = temp->parent->left; } - if (ngx_rbt_is_black(w->right) && ngx_rbt_is_black(w->left)) { + if (ngx_rbt_is_black(w->left) && ngx_rbt_is_black(w->right)) { ngx_rbt_red(w); temp = temp->parent; |