Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
ad58dd02
Commit
ad58dd02
authored
Jun 18, 2016
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Forgot that GCC chokes on REPLACE(foo, NULL)
parent
68ac5a66
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
mgt_vcl.c
bin/varnishd/mgt/mgt_vcl.c
+11
-7
No files found.
bin/varnishd/mgt/mgt_vcl.c
View file @
ad58dd02
...
...
@@ -176,7 +176,7 @@ mgt_vcl_setstate(struct cli *cli, struct vclprog *vp, const char *vs)
VCLI_Out
(
cli
,
"%s"
,
p
);
}
REPLACE
(
p
,
NULL
);
free
(
p
);
return
(
i
);
}
...
...
@@ -229,7 +229,7 @@ mgt_new_vcl(struct cli *cli, const char *vclname, const char *vclsrc,
VCLI_Out
(
cli
,
"%s"
,
p
);
VCLI_SetResult
(
cli
,
CLIS_PARAM
);
}
REPLACE
(
p
,
NULL
);
free
(
p
);
}
/*--------------------------------------------------------------------*/
...
...
@@ -274,7 +274,8 @@ mgt_push_vcls_and_start(struct cli *cli, unsigned *status, char **p)
if
(
mgt_cli_askchild
(
status
,
p
,
"vcl.load
\"
%s
\"
%s %d%s
\n
"
,
vp
->
name
,
vp
->
fname
,
vp
->
warm
,
vp
->
state
))
return
(
1
);
REPLACE
(
*
p
,
NULL
);
free
(
*
p
);
*
p
=
NULL
;
}
VTAILQ_FOREACH
(
vp
,
&
vclhead
,
list
)
{
if
(
strcmp
(
vp
->
state
,
VCL_STATE_LABEL
))
...
...
@@ -282,14 +283,17 @@ mgt_push_vcls_and_start(struct cli *cli, unsigned *status, char **p)
if
(
mgt_cli_askchild
(
status
,
p
,
"vcl.label %s %s
\n
"
,
vp
->
name
,
vp
->
label
->
name
))
return
(
1
);
REPLACE
(
*
p
,
NULL
);
free
(
*
p
);
*
p
=
NULL
;
}
if
(
mgt_cli_askchild
(
status
,
p
,
"vcl.use
\"
%s
\"\n
"
,
active_vcl
->
name
))
return
(
1
);
REPLACE
(
*
p
,
NULL
);
free
(
*
p
);
*
p
=
NULL
;
if
(
mgt_cli_askchild
(
status
,
p
,
"start
\n
"
))
return
(
1
);
REPLACE
(
*
p
,
NULL
);
free
(
*
p
);
*
p
=
NULL
;
return
(
0
);
}
...
...
@@ -421,7 +425,7 @@ mcf_vcl_use(struct cli *cli, const char * const *av, void *priv)
(
void
)
mgt_vcl_setstate
(
cli
,
vp2
,
VCL_STATE_AUTO
);
}
}
REPLACE
(
p
,
NULL
);
free
(
p
);
}
static
void
__match_proto__
(
cli_func_t
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment