Mailing List Archive

commit ead236cf1cec89338cd6975a17749a020b68eea3
Author: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Tue Apr 9 16:37:42 2024 +0000

flexelinting

diff --git a/bin/varnishd/http2/cache_http2_hpack.c b/bin/varnishd/http2/cache_http2_hpack.c
index e32da14ed..8ffeb8ab2 100644
--- a/bin/varnishd/http2/cache_http2_hpack.c
+++ b/bin/varnishd/http2/cache_http2_hpack.c
@@ -38,7 +38,7 @@
#include "vct.h"

static void
-h2h_assert_ready(struct h2h_decode *d)
+h2h_assert_ready(const struct h2h_decode *d)
{

CHECK_OBJ_NOTNULL(d, H2H_DECODE_MAGIC);
@@ -278,7 +278,8 @@ h2h_decode_init(const struct h2_sess *h2)
d->reset = d->out;

if (cache_param->h2_max_header_list_size == 0)
- d->limit = h2->local_settings.max_header_list_size * 1.5;
+ d->limit =
+ (long)(h2->local_settings.max_header_list_size * 1.5);
else
d->limit = cache_param->h2_max_header_list_size;

diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index f7c4c5973..e736d7a36 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -725,7 +725,7 @@ h2_rx_headers(struct worker *wrk, struct h2_sess *h2, struct h2_req *r2)
* increase under our feet.
*/
if (h2->open_streams >=
- h2->local_settings.max_concurrent_streams) {
+ (int)h2->local_settings.max_concurrent_streams) {
VSLb(h2->vsl, SLT_Debug,
"H2: stream %u: Hit maximum number of "
"concurrent streams", h2->rxf_stream);
diff --git a/include/vdef.h b/include/vdef.h
index 86fdb0a21..8db629af1 100644
--- a/include/vdef.h
+++ b/include/vdef.h
@@ -241,5 +241,5 @@ typedef struct {

#define Tcheck(t) do { (void)pdiff((t).b, (t).e); } while (0)
#define Tlen(t) (pdiff((t).b, (t).e))
-#define Tstr(s) ((txt){(s), (s) + strlen(s)})
+#define Tstr(s) (/*lint -e(446)*/ (txt){(s), (s) + strlen(s)})
#define Tstrcmp(t, s) (strncmp((t).b, (s), Tlen(t)))
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit