[master] f41fbd1 Rename '-x dumprst' to '-x dumprstparam', we may have more RST coming in the future.
Poul-Henning Kamp
phk at varnish-cache.org
Mon Jul 2 22:50:26 CEST 2012
commit f41fbd19bdb300f4ec571b09e88202e6a81b72cd
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Jul 2 20:49:56 2012 +0000
Rename '-x dumprst' to '-x dumprstparam', we may have more RST coming
in the future.
diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h
index 65dbc02..512c6dc 100644
--- a/bin/varnishd/mgt/mgt.h
+++ b/bin/varnishd/mgt/mgt.h
@@ -70,7 +70,7 @@ const void *pick(const struct choice *cp, const char *which, const char *kind);
void MCF_ParamInit(struct cli *);
void MCF_ParamSet(struct cli *, const char *param, const char *val);
void MCF_ParamProtect(struct cli *, const char *arg);
-void MCF_DumpRst(void);
+void MCF_DumpRstParam(void);
extern struct params mgt_param;
/* mgt_sandbox.c */
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 88f8253..18f1bb3 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -458,8 +458,8 @@ main(int argc, char * const *argv)
VCS_Message("varnishd");
exit(0);
case 'x':
- if (!strcmp(optarg, "dumprst")) {
- MCF_DumpRst();
+ if (!strcmp(optarg, "dumprstparam")) {
+ MCF_DumpRstParam();
exit (0);
}
usage();
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 859ef14..d17f9e2 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -1503,14 +1503,14 @@ MCF_ParamInit(struct cli *cli)
/*--------------------------------------------------------------------*/
void
-MCF_DumpRst(void)
+MCF_DumpRstParam(void)
{
const struct parspec *pp;
const char *p, *q;
int i;
printf("\n.. The following is the autogenerated "
- "output from varnishd -x dumprst\n\n");
+ "output from varnishd -x dumprstparam\n\n");
for (i = 0; i < nparspec; i++) {
pp = parspecs[i];
printf("%s\n", pp->name);
diff --git a/bin/varnishtest/tests/a00009.vtc b/bin/varnishtest/tests/a00009.vtc
index f89231f..e488b3f 100644
--- a/bin/varnishtest/tests/a00009.vtc
+++ b/bin/varnishtest/tests/a00009.vtc
@@ -1,4 +1,4 @@
varnishtest "Code coverage of VCL compiler and RSTdump"
shell "cd ${topbuild}/bin/varnishd && ./varnishd -b 127.0.0.1:80 -C -n ${tmpdir} > /dev/null 2>&1"
-shell "cd ${topbuild}/bin/varnishd && ./varnishd -x dumprst > /dev/null 2>&1"
+shell "cd ${topbuild}/bin/varnishd && ./varnishd -x dumprstparam > /dev/null 2>&1"
More information about the varnish-commit
mailing list