aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_radix_tree.c
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2012-12-20 11:16:03 +0000
committerRuslan Ermilov <ru@nginx.com>2012-12-20 11:16:03 +0000
commitd03ea4d8421cd4133d2029d82833227286b4ef39 (patch)
tree83f2470872410b15b98dcea1a88ffa0cfce53609 /src/core/ngx_radix_tree.c
parent7ae79fb8e752a28ac746860a943ac70eb616d298 (diff)
downloadnginx-d03ea4d8421cd4133d2029d82833227286b4ef39.tar.gz
nginx-d03ea4d8421cd4133d2029d82833227286b4ef39.zip
Fixed return type of internal function that allocates radix tree nodes.
Diffstat (limited to 'src/core/ngx_radix_tree.c')
-rw-r--r--src/core/ngx_radix_tree.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/ngx_radix_tree.c b/src/core/ngx_radix_tree.c
index 5b35d1e49..ad3b23811 100644
--- a/src/core/ngx_radix_tree.c
+++ b/src/core/ngx_radix_tree.c
@@ -9,7 +9,7 @@
#include <ngx_core.h>
-static void *ngx_radix_alloc(ngx_radix_tree_t *tree);
+static ngx_radix_node_t *ngx_radix_alloc(ngx_radix_tree_t *tree);
ngx_radix_tree_t *
@@ -263,13 +263,13 @@ ngx_radix32tree_find(ngx_radix_tree_t *tree, uint32_t key)
}
-static void *
+static ngx_radix_node_t *
ngx_radix_alloc(ngx_radix_tree_t *tree)
{
- char *p;
+ ngx_radix_node_t *p;
if (tree->free) {
- p = (char *) tree->free;
+ p = tree->free;
tree->free = tree->free->right;
return p;
}
@@ -283,7 +283,7 @@ ngx_radix_alloc(ngx_radix_tree_t *tree)
tree->size = ngx_pagesize;
}
- p = tree->start;
+ p = (ngx_radix_node_t *) tree->start;
tree->start += sizeof(ngx_radix_node_t);
tree->size -= sizeof(ngx_radix_node_t);