diff --git a/bin/varnishd/http2/cache_http2_hpack.c b/bin/varnishd/http2/cache_http2_hpack.c index c4274a65670..5f6f34cf7f6 100644 --- a/bin/varnishd/http2/cache_http2_hpack.c +++ b/bin/varnishd/http2/cache_http2_hpack.c @@ -40,7 +40,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); @@ -280,7 +280,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_panic.c b/bin/varnishd/http2/cache_http2_panic.c index 06ea40c1554..227097e6b4d 100644 --- a/bin/varnishd/http2/cache_http2_panic.c +++ b/bin/varnishd/http2/cache_http2_panic.c @@ -79,7 +79,7 @@ h2_sess_panic(struct vsb *vsb, const struct sess *sp) VSB_printf(vsb, "refcnt = %d, bogosity = %d, error = %s\n", h2->refcnt, h2->bogosity, h2_panic_error(h2->error)); VSB_printf(vsb, - "open_streams = %u, highest_stream = %u," + "open_streams = %d, highest_stream = %u," " goaway_last_stream = %u,\n", h2->open_streams, h2->highest_stream, h2->goaway_last_stream); VSB_cat(vsb, "local_settings = {"); diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c index d9210ff3c50..5d03211601e 100644 --- a/bin/varnishd/http2/cache_http2_proto.c +++ b/bin/varnishd/http2/cache_http2_proto.c @@ -732,7 +732,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 a321407d756..b287e595f25 100644 --- a/include/vdef.h +++ b/include/vdef.h @@ -263,7 +263,7 @@ 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))) /* #3020 dummy definitions until PR is merged*/