summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2014-06-26 03:34:19 +0400
committerMaxim Dounin <mdounin@mdounin.ru>2014-06-26 03:34:19 +0400
commit9d4de05be4b7a27fecc24a80c4feee987e8b531c (patch)
treeb3bdb5ed2173fe40fa82c4e1d46702529da4b95b
parent25250a20d2827954d427222f1f4b1e26c8729d7f (diff)
downloadnginx-9d4de05be4b7a27fecc24a80c4feee987e8b531c.tar.gz
nginx-9d4de05be4b7a27fecc24a80c4feee987e8b531c.tar.bz2
Core: removed meaningless check from ngx_palloc_block().
The check became meaningless after refactoring in 2a92804f4109. With the loop currently in place, "current" can't be NULL, hence the check can be dropped. Additionally, the local variable "current" was removed to simplify code, and pool->current now used directly instead. Found by Coverity (CID 714236).
-rw-r--r--src/core/ngx_palloc.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c
index 1f70f9eee..ef4a64771 100644
--- a/src/core/ngx_palloc.c
+++ b/src/core/ngx_palloc.c
@@ -181,7 +181,7 @@ ngx_palloc_block(ngx_pool_t *pool, size_t size)
{
u_char *m;
size_t psize;
- ngx_pool_t *p, *new, *current;
+ ngx_pool_t *p, *new;
psize = (size_t) (pool->d.end - (u_char *) pool);
@@ -200,18 +200,14 @@ ngx_palloc_block(ngx_pool_t *pool, size_t size)
m = ngx_align_ptr(m, NGX_ALIGNMENT);
new->d.last = m + size;
- current = pool->current;
-
- for (p = current; p->d.next; p = p->d.next) {
+ for (p = pool->current; p->d.next; p = p->d.next) {
if (p->d.failed++ > 4) {
- current = p->d.next;
+ pool->current = p->d.next;
}
}
p->d.next = new;
- pool->current = current ? current : new;
-
return m;
}