From: Olivier Houchard <cognet@ci0.org>
Date: Wed, 1 Nov 2017 12:58:21 +0000 (+0100)
Subject: MINOR: cache: Remove useless test for nonzero.
X-Git-Tag: v1.8-rc2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd2867a012483549bd11928c647c79d22a18c1b6;p=thirdparty%2Fhaproxy.git

MINOR: cache: Remove useless test for nonzero.

Don't bother testing if len is nonzero, we know it is, as we're in the
"else" part of a if (!len), and testing it confuses clang into thinking
ret may be left uninitialized.
---

diff --git a/src/cache.c b/src/cache.c
index 8019ef1fff..4263c91557 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -173,29 +173,27 @@ cache_store_http_forward_data(struct stream *s, struct filter *filter,
 	}
 	else {
 		/* Forward trailers data */
-		if (len) {
-			if (filter->ctx && st->first_block) {
-				/* disable buffering if too much data (never greater than a buffer size */
-				if (len > global.tune.bufsize - global.tune.maxrewrite - st->first_block->len) {
-					filter->ctx = NULL; /* disable cache  */
-					shctx_lock(shctx);
-					shctx_row_dec_hot(shctx, st->first_block);
-					shctx_unlock(shctx);
-					pool_free2(pool2_cache_st, st);
-					ret = 0;
-				} else {
+		if (filter->ctx && st->first_block) {
+			/* disable buffering if too much data (never greater than a buffer size */
+			if (len > global.tune.bufsize - global.tune.maxrewrite - st->first_block->len) {
+				filter->ctx = NULL; /* disable cache  */
+				shctx_lock(shctx);
+				shctx_row_dec_hot(shctx, st->first_block);
+				shctx_unlock(shctx);
+				pool_free2(pool2_cache_st, st);
+				ret = 0;
+			} else {
 
-					int blen;
-					blen = shctx_row_data_append(shctx,
-								 st->first_block,
-								 (unsigned char *)bi_ptr(msg->chn->buf),
-								 MIN(bi_contig_data(msg->chn->buf), len));
+				int blen;
+				blen = shctx_row_data_append(shctx,
+				    st->first_block,
+				    (unsigned char *)bi_ptr(msg->chn->buf),
+				    MIN(bi_contig_data(msg->chn->buf), len));
 
-					ret = MIN(bi_contig_data(msg->chn->buf), len) + blen;
-				}
-			} else {
-				ret = len;
+				ret = MIN(bi_contig_data(msg->chn->buf), len) + blen;
 			}
+		} else {
+			ret = len;
 		}
 	}