From bb389f6111ce8058fadbc6754b301f05890c5dbe Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Sun, 24 Jul 2011 16:10:06 +0000 Subject: [PATCH] fuse two if's in one condition --- src/http/ngx_http_file_cache.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c index feea1c210..493e67d1f 100644 --- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -530,7 +530,7 @@ ngx_http_file_cache_exists(ngx_http_file_cache_t *cache, ngx_http_cache_t *c) goto done; } - if (fcn->exists) { + if (fcn->exists || fcn->uses >= c->min_uses) { c->exists = fcn->exists; c->body_start = fcn->body_start; @@ -540,16 +540,7 @@ ngx_http_file_cache_exists(ngx_http_file_cache_t *cache, ngx_http_cache_t *c) goto done; } - if (fcn->uses >= c->min_uses) { - - c->exists = fcn->exists; - c->body_start = fcn->body_start; - - rc = NGX_OK; - - } else { - rc = NGX_AGAIN; - } + rc = NGX_AGAIN; goto done; }