Mailing List Archive

[master] 2aa70ca53 Eliminate an unwarranted microoptimization.
commit 2aa70ca53438a5aaa915ed1986a37de82dc3485a
Author: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Mon Aug 15 08:12:31 2022 +0000

Eliminate an unwarranted microoptimization.

diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 9414c324d..619729e0d 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -523,7 +523,7 @@ static int v_matchproto_(vdp_bytes_f)
ved_pretend_gzip_bytes(struct vdp_ctx *vdx, enum vdp_action act, void **priv,
const void *pv, ssize_t l)
{
- uint8_t buf1[5], buf2[5];
+ uint8_t buf[5];
const uint8_t *p;
uint16_t lx;
struct ecx *ecx;
@@ -541,24 +541,17 @@ ved_pretend_gzip_bytes(struct vdp_ctx *vdx, enum vdp_action act, void **priv,
ecx->crc = crc32(ecx->crc, p, l);
ecx->l_crc += l;

- lx = 65535;
- buf1[0] = 0;
- vle16enc(buf1 + 1, lx);
- vle16enc(buf1 + 3, ~lx);
-
while (l > 0) {
- if (l >= 65535) {
+ if (l >= 65535)
lx = 65535;
- if (ved_bytes(ecx, VDP_NULL, buf1, sizeof buf1))
- return (-1);
- } else {
+ else
lx = (uint16_t)l;
- buf2[0] = 0;
- vle16enc(buf2 + 1, lx);
- vle16enc(buf2 + 3, ~lx);
- if (ved_bytes(ecx, VDP_NULL, buf2, sizeof buf2))
- return (-1);
- }
+ lx = (uint16_t)l;
+ buf[0] = 0;
+ vle16enc(buf + 1, lx);
+ vle16enc(buf + 3, ~lx);
+ if (ved_bytes(ecx, VDP_NULL, buf, sizeof buf))
+ return (-1);
if (ved_bytes(ecx, VDP_NULL, p, lx))
return (-1);
l -= lx;
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit