RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-11 00:09:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: compression: do not test for buffer before calling b_alloc()

Browse Source 
Now we know the function is idempotent, we don't need to run the
preliminary test anymore.
This commit is contained in:
Willy Tarreau 2021-03-22 16:16:22 +01:00
parent 766b6cf206
commit 862ad82f22
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/compression.c
View File

@ -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);

4
src/flt_http_comp.c
View File

@ -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;
}