Mercurial > hg > nginx

comparison src/core/ngx_conf_file.c @ 5317:f1a91825730a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replaced ngx_conf_full_name() with ngx_get_full_name(). The ngx_get_full_name() function takes more readable arguments list.
author Valentin Bartenev <vbart@nginx.com>
date Tue, 06 Aug 2013 19:58:40 +0400
parents 12dd27b74117
children 7094bd12c1ff
comparison
equal deleted inserted replaced
5316:12dd27b74117 5317:f1a91825730a
745 value = cf->args->elts; 745 value = cf->args->elts;
746 file = value[1]; 746 file = value[1];
747 747
748 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data); 748 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
749 749
750 if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) { 750 if (ngx_get_full_name(cf->pool, &cf->cycle->conf_prefix, &file) != NGX_OK) {
751 return NGX_CONF_ERROR; 751 return NGX_CONF_ERROR;
752 } 752 }
753 753
754 if (strpbrk((char *) file.data, "*?[") == NULL) { 754 if (strpbrk((char *) file.data, "*?[") == NULL) {
755 755
820 #endif 820 #endif
821 821
822 if (name->len) { 822 if (name->len) {
823 full = *name; 823 full = *name;
824 824
825 if (ngx_conf_full_name(cycle, &full, 0) != NGX_OK) { 825 if (ngx_get_full_name(cycle->pool, &cycle->prefix, &full) != NGX_OK) {
826 return NULL; 826 return NULL;
827 } 827 }
828 828
829 part = &cycle->open_files.part; 829 part = &cycle->open_files.part;
830 file = part->elts; 830 file = part->elts;