Fijxu
/
nginx-quic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use ngx_int_t in ngx_sort() callback

This commit is contained in:
Igor Sysoev 2008-03-24 13:04:02 +00:00
parent e3fb99f87a
commit 24da7352fd
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ngx_string.c
View File

@ -1430,7 +1430,7 @@ ngx_escape_html(u_char *dst, u_char *src, size_t size)
void
ngx_sort(void *base, size_t n, size_t size,
int (*cmp)(const void *, const void *))
ngx_int_t (*cmp)(const void *, const void *))
{
u_char *p1, *p2, *p;

2
src/core/ngx_string.h
View File

@ -173,7 +173,7 @@ uintptr_t ngx_escape_html(u_char *dst, u_char *src, size_t size);
void ngx_sort(void *base, size_t n, size_t size,
int (*cmp)(const void *, const void *));
ngx_int_t (*cmp)(const void *, const void *));
#define ngx_qsort qsort

4
src/http/ngx_http.c
View File

@ -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;

5
src/http/ngx_http_core_module.c
View File

@ -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;

5
src/http/ngx_http_upstream_round_robin.c
View File

@ -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;

4
src/mail/ngx_mail.c
View File

@ -11,7 +11,7 @@
static char *ngx_mail_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
static int ngx_mail_cmp_conf_in_addrs(const void *one, const void *two);
static ngx_int_t ngx_mail_cmp_conf_in_addrs(const void *one, const void *two);
ngx_uint_t ngx_mail_max_module;
@ -388,7 +388,7 @@ ngx_mail_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}
static int
static ngx_int_t
ngx_mail_cmp_conf_in_addrs(const void *one, const void *two)
{
ngx_mail_conf_in_addr_t *first, *second;