[master] 820939d48 Revert "Remove mostly harmless casts to (void*)"
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Wed Feb 19 09:05:08 UTC 2020
commit 820939d484a6b291a91c708185b4dd6fa804c399
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Wed Feb 19 10:03:12 2020 +0100
Revert "Remove mostly harmless casts to (void*)"
This reverts commit 2034138ed25036df7c95ac784ece9981ebc596c5.
We already know that SunCC will complain about those. Alternatively we
could use static variables addresses as cookies, but do we need extra
symbols?
diff --git a/lib/libvmod_debug/vmod_debug.c b/lib/libvmod_debug/vmod_debug.c
index 4c8dac699..65836903c 100644
--- a/lib/libvmod_debug/vmod_debug.c
+++ b/lib/libvmod_debug/vmod_debug.c
@@ -928,7 +928,7 @@ xyzzy_store_ip(VRT_CTX, VCL_IP ip)
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
- priv = VRT_priv_task(ctx, xyzzy_store_ip);
+ priv = VRT_priv_task(ctx, (void *)xyzzy_store_ip);
if (priv == NULL) {
VRT_fail(ctx, "no priv task - out of ws?");
return;
@@ -947,7 +947,7 @@ xyzzy_get_ip(VRT_CTX)
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
- priv = VRT_priv_task(ctx, xyzzy_store_ip);
+ priv = VRT_priv_task(ctx, (void *)xyzzy_store_ip);
AN(priv);
AZ(priv->free);
@@ -1110,7 +1110,7 @@ xyzzy_fail_rollback(VRT_CTX)
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
- p = VRT_priv_task(ctx, xyzzy_fail_rollback);
+ p = VRT_priv_task(ctx, (void *)xyzzy_fail_rollback);
if (p == NULL) {
VRT_fail(ctx, "no priv task - out of ws?");
return;
@@ -1133,7 +1133,7 @@ xyzzy_ok_rollback(VRT_CTX)
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
- p = VRT_priv_task(ctx, xyzzy_fail_rollback);
+ p = VRT_priv_task(ctx, (void *)xyzzy_fail_rollback);
if (p == NULL) {
VRT_fail(ctx, "no priv task - out of ws?");
return;
More information about the varnish-commit
mailing list