comparison src/http/ngx_http_core_module.c @ 1209:c6c33f81fd79

use stable search where it is required
author Igor Sysoev <igor@sysoev.ru>
date Mon, 21 May 2007 14:09:12 +0000
parents 94774fc6620f
children 6be3d9073266
comparison
equal deleted inserted replaced
1208:5eae5751507f 1209:c6c33f81fd79
43 43
44 static char *ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd, 44 static char *ngx_http_core_server(ngx_conf_t *cf, ngx_command_t *cmd,
45 void *dummy); 45 void *dummy);
46 static char *ngx_http_core_location(ngx_conf_t *cf, ngx_command_t *cmd, 46 static char *ngx_http_core_location(ngx_conf_t *cf, ngx_command_t *cmd,
47 void *dummy); 47 void *dummy);
48 static int ngx_libc_cdecl ngx_http_core_cmp_locations(const void *first, 48 static int ngx_http_core_cmp_locations(const void *first, const void *second);
49 const void *second);
50 49
51 static char *ngx_http_core_types(ngx_conf_t *cf, ngx_command_t *cmd, 50 static char *ngx_http_core_types(ngx_conf_t *cf, ngx_command_t *cmd,
52 void *conf); 51 void *conf);
53 static char *ngx_http_core_type(ngx_conf_t *cf, ngx_command_t *dummy, 52 static char *ngx_http_core_type(ngx_conf_t *cf, ngx_command_t *dummy,
54 void *conf); 53 void *conf);
1640 1639
1641 if (rv != NGX_CONF_OK) { 1640 if (rv != NGX_CONF_OK) {
1642 return rv; 1641 return rv;
1643 } 1642 }
1644 1643
1645 ngx_qsort(cscf->locations.elts, (size_t) cscf->locations.nelts, 1644 ngx_sort(cscf->locations.elts, (size_t) cscf->locations.nelts,
1646 sizeof(ngx_http_core_loc_conf_t *), ngx_http_core_cmp_locations); 1645 sizeof(ngx_http_core_loc_conf_t *), ngx_http_core_cmp_locations);
1647 1646
1648 return rv; 1647 return rv;
1649 } 1648 }
1650 1649
1651 1650
1812 1811
1813 if (rv != NGX_CONF_OK) { 1812 if (rv != NGX_CONF_OK) {
1814 return rv; 1813 return rv;
1815 } 1814 }
1816 1815
1817 ngx_qsort(clcf->locations.elts, (size_t) clcf->locations.nelts, 1816 ngx_sort(clcf->locations.elts, (size_t) clcf->locations.nelts,
1818 sizeof(ngx_http_core_loc_conf_t *), ngx_http_core_cmp_locations); 1817 sizeof(ngx_http_core_loc_conf_t *), ngx_http_core_cmp_locations);
1819 1818
1820 return rv; 1819 return rv;
1821 } 1820 }
1822 1821
1823 1822
1824 static int ngx_libc_cdecl 1823 static int
1825 ngx_http_core_cmp_locations(const void *one, const void *two) 1824 ngx_http_core_cmp_locations(const void *one, const void *two)
1826 { 1825 {
1827 ngx_int_t rc; 1826 ngx_int_t rc;
1828 ngx_http_core_loc_conf_t *first, *second; 1827 ngx_http_core_loc_conf_t *first, *second;
1829 1828