Klaus Demo nginx / de8ec1e
use ngx_int_t in ngx_sort() callback Igor Sysoev 14 years ago
6 changed file(s) with 12 addition(s) and 10 deletion(s). Raw diff Collapse all Expand all
14291429
14301430 void
14311431 ngx_sort(void *base, size_t n, size_t size,
1432 int (*cmp)(const void *, const void *))
1432 ngx_int_t (*cmp)(const void *, const void *))
14331433 {
14341434 u_char *p1, *p2, *p;
14351435
172172
173173
174174 void ngx_sort(void *base, size_t n, size_t size,
175 int (*cmp)(const void *, const void *));
175 ngx_int_t (*cmp)(const void *, const void *));
176176 #define ngx_qsort qsort
177177
178178
1818 static char *ngx_http_merge_locations(ngx_conf_t *cf,
1919 ngx_array_t *locations, void **loc_conf, ngx_http_module_t *module,
2020 ngx_uint_t ctx_index);
21 static int ngx_http_cmp_conf_in_addrs(const void *one, const void *two);
21 static ngx_int_t ngx_http_cmp_conf_in_addrs(const void *one, const void *two);
2222 static int ngx_libc_cdecl ngx_http_cmp_dns_wildcards(const void *one,
2323 const void *two);
2424
10881088 }
10891089
10901090
1091 static int
1091 static ngx_int_t
10921092 ngx_http_cmp_conf_in_addrs(const void *one, const void *two)
10931093 {
10941094 ngx_http_conf_in_addr_t *first, *second;
4444 void *dummy);
4545 static char *ngx_http_core_location(ngx_conf_t *cf, ngx_command_t *cmd,
4646 void *dummy);
47 static int ngx_http_core_cmp_locations(const void *first, const void *second);
47 static ngx_int_t ngx_http_core_cmp_locations(const void *first,
48 const void *second);
4849
4950 static char *ngx_http_core_types(ngx_conf_t *cf, ngx_command_t *cmd,
5051 void *conf);
22962297 }
22972298
22982299
2299 static int
2300 static ngx_int_t
23002301 ngx_http_core_cmp_locations(const void *one, const void *two)
23012302 {
23022303 ngx_int_t rc;
88 #include <ngx_http.h>
99
1010
11 static int ngx_http_upstream_cmp_servers(const void *one, const void *two);
11 static ngx_int_t ngx_http_upstream_cmp_servers(const void *one,
12 const void *two);
1213 static ngx_uint_t
1314 ngx_http_upstream_get_peer(ngx_http_upstream_rr_peers_t *peers);
1415
184185 }
185186
186187
187 static int
188 static ngx_int_t
188189 ngx_http_upstream_cmp_servers(const void *one, const void *two)
189190 {
190191 ngx_http_upstream_rr_peer_t *first, *second;
1010
1111
1212 static char *ngx_mail_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
13 static int ngx_mail_cmp_conf_in_addrs(const void *one, const void *two);
13 static ngx_int_t ngx_mail_cmp_conf_in_addrs(const void *one, const void *two);
1414
1515
1616 ngx_uint_t ngx_mail_max_module;
387387 }
388388
389389
390 static int
390 static ngx_int_t
391391 ngx_mail_cmp_conf_in_addrs(const void *one, const void *two)
392392 {
393393 ngx_mail_conf_in_addr_t *first, *second;