diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-03-24 13:04:02 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-03-24 13:04:02 +0000 |
| commit | de8ec1efc8fae8f4e86a518c1c86225b9ba62de6 (patch) | |
| tree | 1ba5aaa3099dcbc18f7248657ea8c0276f4e6964 /src/http | |
| parent | 8634118bc82c8f9a5b43abe863edcee24aa878a8 (diff) | |
| download | nginx-de8ec1efc8fae8f4e86a518c1c86225b9ba62de6.tar.gz nginx-de8ec1efc8fae8f4e86a518c1c86225b9ba62de6.tar.bz2 | |
use ngx_int_t in ngx_sort() callback
Diffstat (limited to 'src/http')
| -rw-r--r-- | src/http/ngx_http.c | 4 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 5 | ||||
| -rw-r--r-- | src/http/ngx_http_upstream_round_robin.c | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 22866639a..3ef1dcbc8 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -19,7 +19,7 @@ static ngx_int_t ngx_http_add_names(ngx_conf_t *cf, static char *ngx_http_merge_locations(ngx_conf_t *cf, ngx_array_t *locations, void **loc_conf, ngx_http_module_t *module, ngx_uint_t ctx_index); -static int ngx_http_cmp_conf_in_addrs(const void *one, const void *two); +static ngx_int_t ngx_http_cmp_conf_in_addrs(const void *one, const void *two); static int ngx_libc_cdecl ngx_http_cmp_dns_wildcards(const void *one, const void *two); @@ -1089,7 +1089,7 @@ ngx_http_merge_locations(ngx_conf_t *cf, ngx_array_t *locations, } -static int +static ngx_int_t ngx_http_cmp_conf_in_addrs(const void *one, const void *two) { ngx_http_conf_in_addr_t *first, *second; diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 08c1d352b..ec307cb82 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -45,7 +45,8 @@ static char *ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy); static char *ngx_http_core_location(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy); -static int ngx_http_core_cmp_locations(const void *first, const void *second); +static ngx_int_t ngx_http_core_cmp_locations(const void *first, + const void *second); static char *ngx_http_core_types(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); @@ -2297,7 +2298,7 @@ ngx_http_core_location(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy) } -static int +static ngx_int_t ngx_http_core_cmp_locations(const void *one, const void *two) { ngx_int_t rc; diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c index c25c076b4..062137158 100644 --- a/src/http/ngx_http_upstream_round_robin.c +++ b/src/http/ngx_http_upstream_round_robin.c @@ -9,7 +9,8 @@ #include <ngx_http.h> -static int ngx_http_upstream_cmp_servers(const void *one, const void *two); +static ngx_int_t ngx_http_upstream_cmp_servers(const void *one, + const void *two); static ngx_uint_t ngx_http_upstream_get_peer(ngx_http_upstream_rr_peers_t *peers); @@ -185,7 +186,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, } -static int +static ngx_int_t ngx_http_upstream_cmp_servers(const void *one, const void *two) { ngx_http_upstream_rr_peer_t *first, *second; |