Mercurial > hg > nginx
comparison src/http/ngx_http.c @ 1956:cb8c0c8e0c27
use ngx_int_t in ngx_sort() callback
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 24 Mar 2008 13:04:02 +0000 |
parents | 8c64532e4875 |
children | 248a376403b0 7f6f4568574d |
comparison
equal
deleted
inserted
replaced
1955:466fdc84c82d | 1956:cb8c0c8e0c27 |
---|---|
17 static ngx_int_t ngx_http_add_names(ngx_conf_t *cf, | 17 static ngx_int_t ngx_http_add_names(ngx_conf_t *cf, |
18 ngx_http_conf_in_addr_t *in_addr, ngx_http_core_srv_conf_t *cscf); | 18 ngx_http_conf_in_addr_t *in_addr, ngx_http_core_srv_conf_t *cscf); |
19 static char *ngx_http_merge_locations(ngx_conf_t *cf, | 19 static char *ngx_http_merge_locations(ngx_conf_t *cf, |
20 ngx_array_t *locations, void **loc_conf, ngx_http_module_t *module, | 20 ngx_array_t *locations, void **loc_conf, ngx_http_module_t *module, |
21 ngx_uint_t ctx_index); | 21 ngx_uint_t ctx_index); |
22 static int ngx_http_cmp_conf_in_addrs(const void *one, const void *two); | 22 static ngx_int_t ngx_http_cmp_conf_in_addrs(const void *one, const void *two); |
23 static int ngx_libc_cdecl ngx_http_cmp_dns_wildcards(const void *one, | 23 static int ngx_libc_cdecl ngx_http_cmp_dns_wildcards(const void *one, |
24 const void *two); | 24 const void *two); |
25 | 25 |
26 ngx_uint_t ngx_http_max_module; | 26 ngx_uint_t ngx_http_max_module; |
27 | 27 |
1087 | 1087 |
1088 return NGX_CONF_OK; | 1088 return NGX_CONF_OK; |
1089 } | 1089 } |
1090 | 1090 |
1091 | 1091 |
1092 static int | 1092 static ngx_int_t |
1093 ngx_http_cmp_conf_in_addrs(const void *one, const void *two) | 1093 ngx_http_cmp_conf_in_addrs(const void *one, const void *two) |
1094 { | 1094 { |
1095 ngx_http_conf_in_addr_t *first, *second; | 1095 ngx_http_conf_in_addr_t *first, *second; |
1096 | 1096 |
1097 first = (ngx_http_conf_in_addr_t *) one; | 1097 first = (ngx_http_conf_in_addr_t *) one; |