use stable search where it is required
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 7a1eb89..46e576a 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -19,8 +19,7 @@
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_libc_cdecl ngx_http_cmp_conf_in_addrs(const void *one,
- const void *two);
+static int 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);
@@ -599,8 +598,8 @@
in_port = in_ports.elts;
for (p = 0; p < in_ports.nelts; p++) {
- ngx_qsort(in_port[p].addrs.elts, (size_t) in_port[p].addrs.nelts,
- sizeof(ngx_http_conf_in_addr_t), ngx_http_cmp_conf_in_addrs);
+ ngx_sort(in_port[p].addrs.elts, (size_t) in_port[p].addrs.nelts,
+ sizeof(ngx_http_conf_in_addr_t), ngx_http_cmp_conf_in_addrs);
/*
* check whether all name-based servers have the same configuraiton
@@ -1027,7 +1026,7 @@
}
-static int ngx_libc_cdecl
+static int
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 c2d980b..2334f6d 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -45,8 +45,7 @@
void *dummy);
static char *ngx_http_core_location(ngx_conf_t *cf, ngx_command_t *cmd,
void *dummy);
-static int ngx_libc_cdecl ngx_http_core_cmp_locations(const void *first,
- const void *second);
+static int 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);
@@ -1642,8 +1641,8 @@
return rv;
}
- ngx_qsort(cscf->locations.elts, (size_t) cscf->locations.nelts,
- sizeof(ngx_http_core_loc_conf_t *), ngx_http_core_cmp_locations);
+ ngx_sort(cscf->locations.elts, (size_t) cscf->locations.nelts,
+ sizeof(ngx_http_core_loc_conf_t *), ngx_http_core_cmp_locations);
return rv;
}
@@ -1814,14 +1813,14 @@
return rv;
}
- ngx_qsort(clcf->locations.elts, (size_t) clcf->locations.nelts,
- sizeof(ngx_http_core_loc_conf_t *), ngx_http_core_cmp_locations);
+ ngx_sort(clcf->locations.elts, (size_t) clcf->locations.nelts,
+ sizeof(ngx_http_core_loc_conf_t *), ngx_http_core_cmp_locations);
return rv;
}
-static int ngx_libc_cdecl
+static int
ngx_http_core_cmp_locations(const void *one, const void *two)
{
ngx_int_t rc;
diff --git a/src/mail/ngx_mail.c b/src/mail/ngx_mail.c
index 56e9b04..ec74e6f 100644
--- a/src/mail/ngx_mail.c
+++ b/src/mail/ngx_mail.c
@@ -11,8 +11,7 @@
static char *ngx_mail_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-static int ngx_libc_cdecl ngx_mail_cmp_conf_in_addrs(const void *one,
- const void *two);
+static int ngx_mail_cmp_conf_in_addrs(const void *one, const void *two);
ngx_uint_t ngx_mail_max_module;
@@ -269,8 +268,8 @@
in_port = in_ports.elts;
for (p = 0; p < in_ports.nelts; p++) {
- ngx_qsort(in_port[p].addrs.elts, (size_t) in_port[p].addrs.nelts,
- sizeof(ngx_mail_conf_in_addr_t), ngx_mail_cmp_conf_in_addrs);
+ ngx_sort(in_port[p].addrs.elts, (size_t) in_port[p].addrs.nelts,
+ sizeof(ngx_mail_conf_in_addr_t), ngx_mail_cmp_conf_in_addrs);
in_addr = in_port[p].addrs.elts;
last = in_port[p].addrs.nelts;
@@ -387,7 +386,7 @@
}
-static int ngx_libc_cdecl
+static int
ngx_mail_cmp_conf_in_addrs(const void *one, const void *two)
{
ngx_mail_conf_in_addr_t *first, *second;
