aboutsummaryrefslogtreecommitdiff
path: root/src/http/ngx_http_file_cache.c
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2016-07-06 13:22:29 +0300
committerRuslan Ermilov <ru@nginx.com>2016-07-06 13:22:29 +0300
commit6810b9f14850a7c8aa9becf76236dcf212d088ea (patch)
treebb272b1a2fe0756587bfd58a22a7061298d5f9b6 /src/http/ngx_http_file_cache.c
parent5c4ca2ac80b4ba94c15797fc6f61038740f98f4e (diff)
downloadnginx-6810b9f14850a7c8aa9becf76236dcf212d088ea.tar.gz
nginx-6810b9f14850a7c8aa9becf76236dcf212d088ea.zip
Use NGX_MAX_PATH_LEVEL where appropriate.
The macro was unused since 0.7.44.
Diffstat (limited to 'src/http/ngx_http_file_cache.c')
-rw-r--r--src/http/ngx_http_file_cache.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c
index 38b695ed1..4bf0f7f20 100644
--- a/src/http/ngx_http_file_cache.c
+++ b/src/http/ngx_http_file_cache.c
@@ -101,7 +101,7 @@ ngx_http_file_cache_init(ngx_shm_zone_t *shm_zone, void *data)
return NGX_ERROR;
}
- for (n = 0; n < 3; n++) {
+ for (n = 0; n < NGX_MAX_PATH_LEVEL; n++) {
if (cache->path->level[n] != ocache->path->level[n]) {
ngx_log_error(NGX_LOG_EMERG, shm_zone->shm.log, 0,
"cache \"%V\" had previously different levels",
@@ -2257,7 +2257,7 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
p = value[i].data + 7;
last = value[i].data + value[i].len;
- for (n = 0; n < 3 && p < last; n++) {
+ for (n = 0; n < NGX_MAX_PATH_LEVEL && p < last; n++) {
if (*p > '0' && *p < '3') {
@@ -2268,7 +2268,7 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
break;
}
- if (*p++ == ':' && n < 2 && p != last) {
+ if (*p++ == ':' && n < NGX_MAX_PATH_LEVEL - 1 && p < last) {
continue;
}
@@ -2278,7 +2278,7 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
goto invalid_levels;
}
- if (cache->path->len < 10 + 3) {
+ if (cache->path->len < 10 + NGX_MAX_PATH_LEVEL) {
continue;
}
@@ -2450,7 +2450,7 @@ ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_memcpy(p, "/temp", sizeof("/temp"));
ngx_memcpy(&cache->temp_path->level, &cache->path->level,
- 3 * sizeof(size_t));
+ NGX_MAX_PATH_LEVEL * sizeof(size_t));
cache->temp_path->len = cache->path->len;
cache->temp_path->conf_file = cf->conf_file->file.name.data;