Mercurial > hg > nginx

comparison src/core/ngx_radix_tree.c @ 4976:6b416e3bdd26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed return type of internal function that allocates radix tree nodes.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 20 Dec 2012 11:16:03 +0000
parents efa334556803
children 3be3de31d7dd
comparison
equal deleted inserted replaced
4975:837d0a1bc31c 4976:6b416e3bdd26
7 7
8 #include <ngx_config.h> 8 #include <ngx_config.h>
9 #include <ngx_core.h> 9 #include <ngx_core.h>
10 10
11 11
12 static void *ngx_radix_alloc(ngx_radix_tree_t *tree); 12 static ngx_radix_node_t *ngx_radix_alloc(ngx_radix_tree_t *tree);
13 13
14 14
15 ngx_radix_tree_t * 15 ngx_radix_tree_t *
16 ngx_radix_tree_create(ngx_pool_t *pool, ngx_int_t preallocate) 16 ngx_radix_tree_create(ngx_pool_t *pool, ngx_int_t preallocate)
17 { 17 {
261 261
262 return value; 262 return value;
263 } 263 }
264 264
265 265
266 static void * 266 static ngx_radix_node_t *
267 ngx_radix_alloc(ngx_radix_tree_t *tree) 267 ngx_radix_alloc(ngx_radix_tree_t *tree)
268 { 268 {
269 char *p; 269 ngx_radix_node_t *p;
270 270
271 if (tree->free) { 271 if (tree->free) {
272 p = (char *) tree->free; 272 p = tree->free;
273 tree->free = tree->free->right; 273 tree->free = tree->free->right;
274 return p; 274 return p;
275 } 275 }
276 276
277 if (tree->size < sizeof(ngx_radix_node_t)) { 277 if (tree->size < sizeof(ngx_radix_node_t)) {
281 } 281 }
282 282
283 tree->size = ngx_pagesize; 283 tree->size = ngx_pagesize;
284 } 284 }
285 285
286 p = tree->start; 286 p = (ngx_radix_node_t *) tree->start;
287 tree->start += sizeof(ngx_radix_node_t); 287 tree->start += sizeof(ngx_radix_node_t);
288 tree->size -= sizeof(ngx_radix_node_t); 288 tree->size -= sizeof(ngx_radix_node_t);
289 289
290 return p; 290 return p;
291 } 291 }