Mercurial > hg > nginx
comparison src/core/nginx.c @ 5330:314c3d7cc3a5
Backed out f1a91825730a and 7094bd12c1ff.
While ngx_get_full_name() might have a bit more descriptive arguments,
the ngx_conf_full_name() is generally easier to use when parsing
configuration and limits exposure of cycle->prefix / cycle->conf_prefix
details.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 20 Aug 2013 21:11:19 +0400 |
parents | f1a91825730a |
children | 1209b8a7b077 |
comparison
equal
deleted
inserted
replaced
5329:00bdc9f08a16 | 5330:314c3d7cc3a5 |
---|---|
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_get_full_name(cycle->pool, &cycle->prefix, &cycle->conf_file) | 900 if (ngx_conf_full_name(cycle, &cycle->conf_file, 0) != NGX_OK) { |
901 != NGX_OK) | |
902 { | |
903 return NGX_ERROR; | 901 return NGX_ERROR; |
904 } | 902 } |
905 | 903 |
906 for (p = cycle->conf_file.data + cycle->conf_file.len - 1; | 904 for (p = cycle->conf_file.data + cycle->conf_file.len - 1; |
907 p > cycle->conf_file.data; | 905 p > cycle->conf_file.data; |
1013 | 1011 |
1014 if (ccf->pid.len == 0) { | 1012 if (ccf->pid.len == 0) { |
1015 ngx_str_set(&ccf->pid, NGX_PID_PATH); | 1013 ngx_str_set(&ccf->pid, NGX_PID_PATH); |
1016 } | 1014 } |
1017 | 1015 |
1018 if (ngx_get_full_name(cycle->pool, &cycle->prefix, &ccf->pid) != NGX_OK) { | 1016 if (ngx_conf_full_name(cycle, &ccf->pid, 0) != NGX_OK) { |
1019 return NGX_CONF_ERROR; | 1017 return NGX_CONF_ERROR; |
1020 } | 1018 } |
1021 | 1019 |
1022 ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT); | 1020 ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT); |
1023 | 1021 |
1061 | 1059 |
1062 if (ccf->lock_file.len == 0) { | 1060 if (ccf->lock_file.len == 0) { |
1063 ngx_str_set(&ccf->lock_file, NGX_LOCK_PATH); | 1061 ngx_str_set(&ccf->lock_file, NGX_LOCK_PATH); |
1064 } | 1062 } |
1065 | 1063 |
1066 if (ngx_get_full_name(cycle->pool, &cycle->prefix, &ccf->lock_file) | 1064 if (ngx_conf_full_name(cycle, &ccf->lock_file, 0) != NGX_OK) { |
1067 != NGX_OK) | |
1068 { | |
1069 return NGX_CONF_ERROR; | 1065 return NGX_CONF_ERROR; |
1070 } | 1066 } |
1071 | 1067 |
1072 { | 1068 { |
1073 ngx_str_t lock_file; | 1069 ngx_str_t lock_file; |