commit ddc8cbd1ac3756841560a1c6ddf61e0500e1914c
author Igor Sysoev <igor@sysoev.ru> Thu Dec 20 21:29:52 2007 +0000
committer Igor Sysoev <igor@sysoev.ru> Thu Dec 20 21:29:52 2007 +0000
tree 6e94541732a2c70ddb3734d6c4f36944783968a6
parent 01a129d82383ace02bd9225efec48b7603f06a83

embed sentinel

src/core/ngx_open_file_cache.c

diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c
index d518f4b..3b3e628 100644
--- a/src/core/ngx_open_file_cache.c
+++ b/src/core/ngx_open_file_cache.c
@@ -33,7 +33,6 @@
 ngx_open_file_cache_t *
 ngx_open_file_cache_init(ngx_pool_t *pool, ngx_uint_t max, time_t inactive)
 {
-    ngx_rbtree_node_t      *sentinel;
     ngx_pool_cleanup_t     *cln;
     ngx_open_file_cache_t  *cache;
 
@@ -48,12 +47,7 @@
     cache->list_tail.prev = &cache->list_head;
     cache->list_tail.next = NULL;
 
-    sentinel = ngx_palloc(pool, sizeof(ngx_rbtree_node_t));
-    if (sentinel == NULL) {
-        return NULL;
-    }
-
-    ngx_rbtree_init(&cache->rbtree, sentinel,
+    ngx_rbtree_init(&cache->rbtree, &cache->sentinel,
                     ngx_open_file_cache_rbtree_insert_value);
 
     cache->current = 0;

src/core/ngx_open_file_cache.h

diff --git a/src/core/ngx_open_file_cache.h b/src/core/ngx_open_file_cache.h
index cc0d899..272bcb5 100644
--- a/src/core/ngx_open_file_cache.h
+++ b/src/core/ngx_open_file_cache.h
@@ -63,6 +63,7 @@
 
 typedef struct {
     ngx_rbtree_t             rbtree;
+    ngx_rbtree_node_t        sentinel;
     ngx_cached_open_file_t   list_head;
     ngx_cached_open_file_t   list_tail;