Mercurial > hg > nginx

comparison src/core/nginx.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 e088695737c3
children 314c3d7cc3a5
comparison
equal deleted inserted replaced
5316:12dd27b74117 5317:f1a91825730a
895 895
896 } else { 896 } else {
897 ngx_str_set(&cycle->conf_file, NGX_CONF_PATH); 897 ngx_str_set(&cycle->conf_file, NGX_CONF_PATH);
898 } 898 }
899 899
900 if (ngx_conf_full_name(cycle, &cycle->conf_file, 0) != NGX_OK) { 900 if (ngx_get_full_name(cycle->pool, &cycle->prefix, &cycle->conf_file)
901 != NGX_OK)
902 {
901 return NGX_ERROR; 903 return NGX_ERROR;
902 } 904 }
903 905
904 for (p = cycle->conf_file.data + cycle->conf_file.len - 1; 906 for (p = cycle->conf_file.data + cycle->conf_file.len - 1;
905 p > cycle->conf_file.data; 907 p > cycle->conf_file.data;
1011 1013
1012 if (ccf->pid.len == 0) { 1014 if (ccf->pid.len == 0) {
1013 ngx_str_set(&ccf->pid, NGX_PID_PATH); 1015 ngx_str_set(&ccf->pid, NGX_PID_PATH);
1014 } 1016 }
1015 1017
1016 if (ngx_conf_full_name(cycle, &ccf->pid, 0) != NGX_OK) { 1018 if (ngx_get_full_name(cycle->pool, &cycle->prefix, &ccf->pid) != NGX_OK) {
1017 return NGX_CONF_ERROR; 1019 return NGX_CONF_ERROR;
1018 } 1020 }
1019 1021
1020 ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT); 1022 ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT);
1021 1023
1059 1061
1060 if (ccf->lock_file.len == 0) { 1062 if (ccf->lock_file.len == 0) {
1061 ngx_str_set(&ccf->lock_file, NGX_LOCK_PATH); 1063 ngx_str_set(&ccf->lock_file, NGX_LOCK_PATH);
1062 } 1064 }
1063 1065
1064 if (ngx_conf_full_name(cycle, &ccf->lock_file, 0) != NGX_OK) { 1066 if (ngx_get_full_name(cycle->pool, &cycle->prefix, &ccf->lock_file)
1067 != NGX_OK)
1068 {
1065 return NGX_CONF_ERROR; 1069 return NGX_CONF_ERROR;
1066 } 1070 }
1067 1071
1068 { 1072 {
1069 ngx_str_t lock_file; 1073 ngx_str_t lock_file;