[master] 0bbadc56b vtc_http2: Avoid weak symbol names for temp variables

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Tue Jan 31 11:47:07 UTC 2023


commit 0bbadc56b5fc2a1bb5a8100772c0b49efd036754
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Jan 31 11:32:35 2023 +0100

    vtc_http2: Avoid weak symbol names for temp variables

diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index cc93e550e..b70944bda 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -1913,7 +1913,7 @@ cmd_txprio(CMD_ARGS)
 static void
 cmd_txsettings(CMD_ARGS)
 {
-	struct stream *s, *_s;
+	struct stream *s, *s2;
 	struct http *hp;
 	char *p;
 	uint32_t val = 0;
@@ -1953,8 +1953,8 @@ cmd_txsettings(CMD_ARGS)
 			PUT_KV(av, vl, maxstreams, val, 0x3);
 		else if (!strcmp(*av, "-winsize"))	{
 			PUT_KV(av, vl, winsize, val, 0x4);
-			VTAILQ_FOREACH(_s, &hp->streams, list)
-				_s->win_self += (val - hp->h2_win_self->init);
+			VTAILQ_FOREACH(s2, &hp->streams, list)
+				s2->win_self += (val - hp->h2_win_self->init);
 			hp->h2_win_self->init = val;
 		}
 		else if (!strcmp(*av, "-framesize"))
@@ -2439,7 +2439,7 @@ cmd_rxwinup(CMD_ARGS)
 static void
 cmd_rxsettings(CMD_ARGS)
 {
-	struct stream *s, *_s;
+	struct stream *s, *s2;
 	uint32_t val = 0;
 	struct http *hp;
 	struct frame *f;
@@ -2451,8 +2451,8 @@ cmd_rxsettings(CMD_ARGS)
 	CHKFRAME(f->type, TYPE_SETTINGS, 0, *av);
 	if (! isnan(f->md.settings[SETTINGS_INITIAL_WINDOW_SIZE])) {
 		val = f->md.settings[SETTINGS_INITIAL_WINDOW_SIZE];
-		VTAILQ_FOREACH(_s, &hp->streams, list)
-			_s->win_peer += (val - hp->h2_win_peer->init);
+		VTAILQ_FOREACH(s2, &hp->streams, list)
+			s2->win_peer += (val - hp->h2_win_peer->init);
 		hp->h2_win_peer->init = val;
 	}
 }


More information about the varnish-commit mailing list