From 862ad82f22adacb0d2ad2a3e109b36f763cdf704 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 22 Mar 2021 16:16:22 +0100 Subject: [PATCH] CLEANUP: compression: do not test for buffer before calling b_alloc() Now we know the function is idempotent, we don't need to run the preliminary test anymore. --- src/compression.c | 7 ++----- src/flt_http_comp.c | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/compression.c b/src/compression.c index 26dcd4283..da6213ed3 100644 --- a/src/compression.c +++ b/src/compression.c @@ -294,11 +294,8 @@ static int rfc195x_add_data(struct comp_ctx *comp_ctx, const char *in_data, int * data and need a buffer now. We reuse the same buffer, as it's * not used out of the scope of a series of add_data()*, end(). */ - if (unlikely(!tmpbuf.size)) { - /* this is the first time we need the compression buffer */ - if (b_alloc(&tmpbuf) == NULL) - return -1; /* no memory */ - } + if (b_alloc(&tmpbuf) == NULL) + return -1; /* no memory */ b_reset(&tmpbuf); memcpy(b_tail(&tmpbuf), comp_ctx->direct_ptr, comp_ctx->direct_len); b_add(&tmpbuf, comp_ctx->direct_len); diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c index de61cac75..c9eb16bf9 100644 --- a/src/flt_http_comp.c +++ b/src/flt_http_comp.c @@ -66,9 +66,9 @@ comp_flt_init(struct proxy *px, struct flt_conf *fconf) static int comp_flt_init_per_thread(struct proxy *px, struct flt_conf *fconf) { - if (!tmpbuf.size && b_alloc(&tmpbuf) == NULL) + if (b_alloc(&tmpbuf) == NULL) return -1; - if (!zbuf.size && b_alloc(&zbuf) == NULL) + if (b_alloc(&zbuf) == NULL) return -1; return 0; }