Polishing

bin/varnishd/http2/cache_http2_proto.c

@@ -893,10 +893,9 @@ h2_frame_complete(struct http_conn *htc)
 /**********************************************************************/
 
 static h2_error
-h2_procframe(struct worker *wrk, struct h2_sess *h2,
-    h2_frame h2f)
+h2_procframe(struct worker *wrk, struct h2_sess *h2, h2_frame h2f)
 {
-	struct h2_req *r2 = NULL;
+	struct h2_req *r2;
 	h2_error h2e;
 
 	ASSERT_RXTHR(h2);

bin/varnishd/http2/cache_http2_session.c

@@ -55,18 +55,16 @@ static const char H2_prism[24] = {
 static size_t
 h2_enc_settings(const struct h2_settings *h2s, uint8_t *buf, size_t n)
 {
-	uint8_t *b;
 	size_t len = 0;
 
-	b = buf;
 #define H2_SETTING(U,l,v,d,...)				\
 	if (h2s->l != d) {				\
 		len += 6;				\
 		assert(len <= n);			\
-		vbe16enc(b, v);				\
-		b += 2;					\
-		vbe32enc(b, h2s->l);			\
-		b += 4;					\
+		vbe16enc(buf, v);			\
+		buf += 2;				\
+		vbe32enc(buf, h2s->l);			\
+		buf += 4;				\
 	}
 #include "tbl/h2_settings.h"
 	return (len);