diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-02-11 12:26:33 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-02-11 12:26:33 +0000 |
| commit | 20951d0eae32084b35ded4013b10ee80b1882c63 (patch) | |
| tree | 762ce8591108a0cf9cb82c26c9c74c0f1edd6aa2 /src/core/ngx_radix_tree.c | |
| parent | b217a2a46705b3fc6eb939fe112e5145ae263135 (diff) | |
| download | nginx-20951d0eae32084b35ded4013b10ee80b1882c63.tar.gz nginx-20951d0eae32084b35ded4013b10ee80b1882c63.tar.bz2 | |
Merge of r4968, r4969, r4977, r4980, r4981, r4990: geo fixes.
*) Geo: improved ngx_http_geo_block() code readability.
*) Geo: fixed the "ranges" without ranges case. The following
configuration returned an empty value for $geo:
geo $geo {
ranges;
default default;
}
*) Fixed return type of internal function that allocates radix tree nodes.
*) There's no need to normalize address returned by ngx_ptocidr().
*) Geo: ensure that default entry is always present. If 0.0.0.0/32 entry
was present and there was no explicit "default", we failed to add an
empty string as a default value.
*) Trailing whitespace fix.
Diffstat (limited to 'src/core/ngx_radix_tree.c')
| -rw-r--r-- | src/core/ngx_radix_tree.c | 10 |
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); |