[master] 40f5a532c Make struct waited::priv2 a const void * instead of uintptr_t

[Poul-Henning Kamp]

commit 40f5a532c30e1bb026a1eba939be71cbf1037f71
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sat Mar 4 08:53:34 2023 +0000

    Make struct waited::priv2 a const void * instead of uintptr_t

diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index d0834fc6c..dfa2a0bf7 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -454,8 +454,7 @@ ses_handle(struct waited *wp, enum wait_event ev, vtim_real now)
 
 	CHECK_OBJ_NOTNULL(wp, WAITED_MAGIC);
 	CAST_OBJ_NOTNULL(sp, wp->priv1, SESS_MAGIC);
-	CAST_OBJ_NOTNULL(xp, (const void*)wp->priv2, TRANSPORT_MAGIC);
-	AN(wp->priv2);
+	CAST_OBJ_NOTNULL(xp, wp->priv2, TRANSPORT_MAGIC);
 	assert(WS_Reservation(sp->ws) == wp);
 	FINI_OBJ(wp);
 
@@ -526,7 +525,7 @@ SES_Wait(struct sess *sp, const struct transport *xp)
 	INIT_OBJ(wp, WAITED_MAGIC);
 	wp->fd = sp->fd;
 	wp->priv1 = sp;
-	wp->priv2 = (uintptr_t)xp;
+	wp->priv2 = xp;
 	wp->idle = sp->t_idle;
 	wp->func = ses_handle;
 	wp->tmo = SESS_TMO(sp, timeout_idle);
diff --git a/bin/varnishd/waiter/waiter.h b/bin/varnishd/waiter/waiter.h
index 912f76669..ac00650dd 100644
--- a/bin/varnishd/waiter/waiter.h
+++ b/bin/varnishd/waiter/waiter.h
@@ -62,7 +62,7 @@ struct waited {
 	int			fd;
 	unsigned		idx;
 	void			*priv1;
-	uintptr_t		priv2;
+	const void		*priv2;
 	waiter_handle_f		*func;
 	vtim_dur		tmo;
 	vtim_real		idle;