Mercurial > hg > nginx
comparison src/core/ngx_file.c @ 5317:f1a91825730a
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 | 314c3d7cc3a5 |
comparison
equal
deleted
inserted
replaced
5316:12dd27b74117 | 5317:f1a91825730a |
---|---|
353 | 353 |
354 if (path->name.data[path->name.len - 1] == '/') { | 354 if (path->name.data[path->name.len - 1] == '/') { |
355 path->name.len--; | 355 path->name.len--; |
356 } | 356 } |
357 | 357 |
358 if (ngx_conf_full_name(cf->cycle, &path->name, 0) != NGX_OK) { | 358 if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &path->name) |
359 != NGX_OK) | |
360 { | |
359 return NULL; | 361 return NULL; |
360 } | 362 } |
361 | 363 |
362 path->len = 0; | 364 path->len = 0; |
363 path->manager = NULL; | 365 path->manager = NULL; |
407 return NGX_CONF_ERROR; | 409 return NGX_CONF_ERROR; |
408 } | 410 } |
409 | 411 |
410 (*path)->name = init->name; | 412 (*path)->name = init->name; |
411 | 413 |
412 if (ngx_conf_full_name(cf->cycle, &(*path)->name, 0) != NGX_OK) { | 414 if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &(*path)->name) |
415 != NGX_OK) | |
416 { | |
413 return NGX_CONF_ERROR; | 417 return NGX_CONF_ERROR; |
414 } | 418 } |
415 | 419 |
416 (*path)->level[0] = init->level[0]; | 420 (*path)->level[0] = init->level[0]; |
417 (*path)->level[1] = init->level[1]; | 421 (*path)->level[1] = init->level[1]; |