[master] d99f62a9c Use vmin_t in vcl_acl_disjoint()

Nils Goroll nils.goroll at uplex.de
Tue Jul 11 20:21:06 UTC 2023


commit d99f62a9c5d4c6de492abae63510555d51a53324
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Jul 11 22:12:43 2023 +0200

    Use vmin_t in vcl_acl_disjoint()

diff --git a/lib/libvcc/vcc_acl.c b/lib/libvcc/vcc_acl.c
index 818693670..dffd9013c 100644
--- a/lib/libvcc/vcc_acl.c
+++ b/lib/libvcc/vcc_acl.c
@@ -133,9 +133,7 @@ vcl_acl_disjoint(const struct acl_e *ae1, const struct acl_e *ae2)
 
 	p1 = ae1->data;
 	p2 = ae2->data;
-	m = ae1->mask;
-	if (ae2->mask < m)
-		m = ae2->mask;
+	m = vmin_t(unsigned, ae1->mask, ae2->mask);
 	for (; m >= 8; m -= 8) {
 		CMP(*p1, *p2);
 		p1++;


More information about the varnish-commit mailing list