[nginx] svn commit: r4977 - trunk/src/core

ru at nginx.com ru at nginx.com
Thu Dec 20 11:16:04 UTC 2012


Author: ru
Date: 2012-12-20 11:16:03 +0000 (Thu, 20 Dec 2012)
New Revision: 4977
URL: http://trac.nginx.org/nginx/changeset/4977/nginx

Log:
Fixed return type of internal function that allocates radix tree nodes.


Modified:
   trunk/src/core/ngx_radix_tree.c

Modified: trunk/src/core/ngx_radix_tree.c
===================================================================
--- trunk/src/core/ngx_radix_tree.c	2012-12-19 10:33:56 UTC (rev 4976)
+++ trunk/src/core/ngx_radix_tree.c	2012-12-20 11:16:03 UTC (rev 4977)
@@ -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 @@
 }
 
 
-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 @@
         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);
 



More information about the nginx-devel mailing list