Mercurial > hg > nginx
comparison src/core/ngx_file.c @ 6617:8bf484eef9ab
Use NGX_MAX_PATH_LEVEL where appropriate.
The macro was unused since 0.7.44.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Wed, 06 Jul 2016 13:22:29 +0300 |
parents | f01ab2dbcfdc |
children | 1606a817c1d4 |
comparison
equal
deleted
inserted
replaced
6616:82b0cd4a0324 | 6617:8bf484eef9ab |
---|---|
223 | 223 |
224 i = path->name.len + 1; | 224 i = path->name.len + 1; |
225 | 225 |
226 file[path->name.len + path->len] = '/'; | 226 file[path->name.len + path->len] = '/'; |
227 | 227 |
228 for (n = 0; n < 3; n++) { | 228 for (n = 0; n < NGX_MAX_PATH_LEVEL; n++) { |
229 level = path->level[n]; | 229 level = path->level[n]; |
230 | 230 |
231 if (level == 0) { | 231 if (level == 0) { |
232 break; | 232 break; |
233 } | 233 } |
247 ngx_err_t err; | 247 ngx_err_t err; |
248 ngx_uint_t i; | 248 ngx_uint_t i; |
249 | 249 |
250 pos = path->name.len; | 250 pos = path->name.len; |
251 | 251 |
252 for (i = 0; i < 3; i++) { | 252 for (i = 0; i < NGX_MAX_PATH_LEVEL; i++) { |
253 if (path->level[i] == 0) { | 253 if (path->level[i] == 0) { |
254 break; | 254 break; |
255 } | 255 } |
256 | 256 |
257 pos += path->level[i] + 1; | 257 pos += path->level[i] + 1; |
397 | 397 |
398 char * | 398 char * |
399 ngx_conf_merge_path_value(ngx_conf_t *cf, ngx_path_t **path, ngx_path_t *prev, | 399 ngx_conf_merge_path_value(ngx_conf_t *cf, ngx_path_t **path, ngx_path_t *prev, |
400 ngx_path_init_t *init) | 400 ngx_path_init_t *init) |
401 { | 401 { |
402 ngx_uint_t i; | |
403 | |
402 if (*path) { | 404 if (*path) { |
403 return NGX_CONF_OK; | 405 return NGX_CONF_OK; |
404 } | 406 } |
405 | 407 |
406 if (prev) { | 408 if (prev) { |
417 | 419 |
418 if (ngx_conf_full_name(cf->cycle, &(*path)->name, 0) != NGX_OK) { | 420 if (ngx_conf_full_name(cf->cycle, &(*path)->name, 0) != NGX_OK) { |
419 return NGX_CONF_ERROR; | 421 return NGX_CONF_ERROR; |
420 } | 422 } |
421 | 423 |
422 (*path)->level[0] = init->level[0]; | 424 for (i = 0; i < NGX_MAX_PATH_LEVEL; i++) { |
423 (*path)->level[1] = init->level[1]; | 425 (*path)->level[i] = init->level[i]; |
424 (*path)->level[2] = init->level[2]; | 426 (*path)->len += init->level[i] + (init->level[i] ? 1 : 0); |
425 | 427 } |
426 (*path)->len = init->level[0] + (init->level[0] ? 1 : 0) | |
427 + init->level[1] + (init->level[1] ? 1 : 0) | |
428 + init->level[2] + (init->level[2] ? 1 : 0); | |
429 | 428 |
430 if (ngx_add_path(cf, path) != NGX_OK) { | 429 if (ngx_add_path(cf, path) != NGX_OK) { |
431 return NGX_CONF_ERROR; | 430 return NGX_CONF_ERROR; |
432 } | 431 } |
433 | 432 |
516 "used in %s:%ui and", | 515 "used in %s:%ui and", |
517 &p[i]->name, p[i]->conf_file, p[i]->line); | 516 &p[i]->name, p[i]->conf_file, p[i]->line); |
518 return NGX_ERROR; | 517 return NGX_ERROR; |
519 } | 518 } |
520 | 519 |
521 for (n = 0; n < 3; n++) { | 520 for (n = 0; n < NGX_MAX_PATH_LEVEL; n++) { |
522 if (p[i]->level[n] != path->level[n]) { | 521 if (p[i]->level[n] != path->level[n]) { |
523 if (path->conf_file == NULL) { | 522 if (path->conf_file == NULL) { |
524 if (p[i]->conf_file == NULL) { | 523 if (p[i]->conf_file == NULL) { |
525 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | 524 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, |
526 "the default path name \"%V\" has " | 525 "the default path name \"%V\" has " |