Commit 3a73406b authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Fixes for at least one GCC bug

parent cea487b4
...@@ -120,7 +120,7 @@ static unsigned need_test; ...@@ -120,7 +120,7 @@ static unsigned need_test;
*/ */
static int static int
vca_tcp_opt_init() vca_tcp_opt_init(void)
{ {
int n, x; int n, x;
int one = 1; int one = 1;
......
...@@ -120,7 +120,7 @@ VRT_Vmod_Init(void **hdl, void *ptr, int len, const char *nm, ...@@ -120,7 +120,7 @@ VRT_Vmod_Init(void **hdl, void *ptr, int len, const char *nm,
if (strcmp(w, VMOD_ABI_Version)) { if (strcmp(w, VMOD_ABI_Version)) {
VCLI_Out(cli, "Loading VMOD %s from %s:\n", nm, path); 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", VCLI_Out(cli, " incompatible with varnish ABI (%s)\n",
VMOD_ABI_Version); VMOD_ABI_Version);
(void)dlclose(v->hdl); (void)dlclose(v->hdl);
......
...@@ -134,7 +134,7 @@ vmod_round_robin__fini(struct req *req, struct vmod_directors_round_robin **rrp) ...@@ -134,7 +134,7 @@ vmod_round_robin__fini(struct req *req, struct vmod_directors_round_robin **rrp)
VTAILQ_REMOVE(&rr->listhead, ep, list); VTAILQ_REMOVE(&rr->listhead, ep, list);
FREE_OBJ(ep); FREE_OBJ(ep);
} }
REPLACE(rr->dir->vcl_name, NULL); free(rr->dir->vcl_name);
FREE_OBJ(rr->dir); FREE_OBJ(rr->dir);
FREE_OBJ(rr); FREE_OBJ(rr);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment