[master] 3a73406 Fixes for at least one GCC bug
Poul-Henning Kamp
phk at varnish-cache.org
Thu Mar 7 11:37:46 CET 2013
commit 3a73406bbdbc25c4857510f32001bacd1a8ab777
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Thu Mar 7 10:37:31 2013 +0000
Fixes for at least one GCC bug
diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index 5c8f30a..ee9352f 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -120,7 +120,7 @@ static unsigned need_test;
*/
static int
-vca_tcp_opt_init()
+vca_tcp_opt_init(void)
{
int n, x;
int one = 1;
diff --git a/bin/varnishd/cache/cache_vrt_vmod.c b/bin/varnishd/cache/cache_vrt_vmod.c
index 3a90a4d..dea71ff 100644
--- a/bin/varnishd/cache/cache_vrt_vmod.c
+++ b/bin/varnishd/cache/cache_vrt_vmod.c
@@ -120,7 +120,7 @@ VRT_Vmod_Init(void **hdl, void *ptr, int len, const char *nm,
if (strcmp(w, VMOD_ABI_Version)) {
VCLI_Out(cli, "Loading VMOD %s from %s:\n", nm, path);
- VCLI_Out(cli, "VMOD ABI (%s)", w);
+ VCLI_Out(cli, "VMOD ABI (%s)", (char*)w);
VCLI_Out(cli, " incompatible with varnish ABI (%s)\n",
VMOD_ABI_Version);
(void)dlclose(v->hdl);
diff --git a/lib/libvmod_directors/round_robin.c b/lib/libvmod_directors/round_robin.c
index ce89039..9339046 100644
--- a/lib/libvmod_directors/round_robin.c
+++ b/lib/libvmod_directors/round_robin.c
@@ -134,7 +134,7 @@ vmod_round_robin__fini(struct req *req, struct vmod_directors_round_robin **rrp)
VTAILQ_REMOVE(&rr->listhead, ep, list);
FREE_OBJ(ep);
}
- REPLACE(rr->dir->vcl_name, NULL);
+ free(rr->dir->vcl_name);
FREE_OBJ(rr->dir);
FREE_OBJ(rr);
}
More information about the varnish-commit
mailing list