]> git.kaiwu.me - nginx.git/commitdiff
use ngx_rbtree_init()
authorIgor Sysoev <igor@sysoev.ru>
Mon, 3 Dec 2007 12:17:26 +0000 (12:17 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Mon, 3 Dec 2007 12:17:26 +0000 (12:17 +0000)
src/core/ngx_resolver.c

index 5b4a8bac2ed8ee8b3b83e1ff06272663e6f87c25..6963acd0253127a32f2a8297f229d8aee98e97ce 100644 (file)
@@ -104,17 +104,11 @@ ngx_resolver_create(ngx_peer_addr_t *addr, ngx_log_t *log)
         return NULL;
     }
 
-    ngx_rbtree_sentinel_init(&r->name_sentinel);
+    ngx_rbtree_init(&r->name_rbtree, &r->name_sentinel,
+                    ngx_resolver_rbtree_insert_value);
 
-    r->name_rbtree.root = &r->name_sentinel;
-    r->name_rbtree.sentinel = &r->name_sentinel;
-    r->name_rbtree.insert = ngx_resolver_rbtree_insert_value;
-
-    ngx_rbtree_sentinel_init(&r->addr_sentinel);
-
-    r->addr_rbtree.root = &r->addr_sentinel;
-    r->addr_rbtree.sentinel = &r->addr_sentinel;
-    r->addr_rbtree.insert = ngx_rbtree_insert_value;
+    ngx_rbtree_init(&r->addr_rbtree, &r->addr_sentinel,
+                    ngx_rbtree_insert_value);
 
     ngx_queue_init(&r->name_resend_queue);
     ngx_queue_init(&r->addr_resend_queue);