r998 - in trunk/varnish-cache: bin/varnishd include

[phk at projects.linpro.no]

Author: phk
Date: 2006-09-16 09:49:35 +0200 (Sat, 16 Sep 2006)
New Revision: 998

Modified:
   trunk/varnish-cache/bin/varnishd/cache_cli.c
   trunk/varnish-cache/bin/varnishd/mgt_cli.c
   trunk/varnish-cache/include/cli.h
Log:
Rename the config.* CLI command family to vcl.*.  It is more intuitive
that way and we may eventually want a config file for varnishd to
control obscure parameters.



Modified: trunk/varnish-cache/bin/varnishd/cache_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_cli.c	2006-09-16 07:44:15 UTC (rev 997)
+++ trunk/varnish-cache/bin/varnishd/cache_cli.c	2006-09-16 07:49:35 UTC (rev 998)
@@ -40,10 +40,10 @@
 	{ CLI_URL_QUERY,	cli_func_url_query },
 #endif
 	{ CLI_URL_PURGE,	cli_func_url_purge },
-	{ CLI_CONFIG_LOAD,	cli_func_config_load },
-	{ CLI_CONFIG_LIST,	cli_func_config_list },
-	{ CLI_CONFIG_DISCARD,	cli_func_config_discard },
-	{ CLI_CONFIG_USE,	cli_func_config_use },
+	{ CLI_VCL_LOAD,		cli_func_config_load },
+	{ CLI_VCL_LIST,		cli_func_config_list },
+	{ CLI_VCL_DISCARD,	cli_func_config_discard },
+	{ CLI_VCL_USE,		cli_func_config_use },
 
 	/* Undocumented */
 	{ "dump.pool", "dump.pool",

Modified: trunk/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_cli.c	2006-09-16 07:44:15 UTC (rev 997)
+++ trunk/varnish-cache/bin/varnishd/mgt_cli.c	2006-09-16 07:49:35 UTC (rev 998)
@@ -110,11 +110,11 @@
 	{ CLI_SERVER_START,	mcf_server_startstop, NULL },
 	{ CLI_SERVER_STOP,	mcf_server_startstop, &cli_proto },
 	{ CLI_STATS,		mcf_stats, NULL },
-	{ CLI_CONFIG_LOAD,	mcf_config_load, NULL },
-	{ CLI_CONFIG_INLINE,	mcf_config_inline, NULL },
-	{ CLI_CONFIG_USE,	mcf_config_use, NULL },
-	{ CLI_CONFIG_DISCARD,	mcf_config_discard, NULL },
-	{ CLI_CONFIG_LIST,	mcf_config_list, NULL },
+	{ CLI_VCL_LOAD,		mcf_config_load, NULL },
+	{ CLI_VCL_INLINE,	mcf_config_inline, NULL },
+	{ CLI_VCL_USE,		mcf_config_use, NULL },
+	{ CLI_VCL_DISCARD,	mcf_config_discard, NULL },
+	{ CLI_VCL_LIST,		mcf_config_list, NULL },
 	{ CLI_PARAM_SHOW,	mcf_param_show, NULL },
 	{ CLI_PARAM_SET,	mcf_param_set, NULL },
 	{ CLI_HELP,		cli_func_help, NULL },

Modified: trunk/varnish-cache/include/cli.h
===================================================================
--- trunk/varnish-cache/include/cli.h	2006-09-16 07:44:15 UTC (rev 997)
+++ trunk/varnish-cache/include/cli.h	2006-09-16 07:49:35 UTC (rev 998)
@@ -47,33 +47,33 @@
 	"\tReturns all metadata for the specified URL",			\
 	1, 1
 
-#define CLI_CONFIG_LOAD							\
-	"config.load",							\
-	"config.load <configname> <filename>",				\
+#define CLI_VCL_LOAD							\
+	"vcl.load",							\
+	"vcl.load <configname> <filename>",				\
 	"\tCompile and load the VCL file under the name provided.",	\
 	2, 2
 
-#define CLI_CONFIG_INLINE						\
-	"config.inline",						\
-	"config.inline <configname> <quoted_VCLstring>",		\
+#define CLI_VCL_INLINE						\
+	"vcl.inline",						\
+	"vcl.inline <configname> <quoted_VCLstring>",		\
 	"\tCompile and load the VCL data under the name provided.",	\
 	2, 2
 
-#define CLI_CONFIG_DISCARD						\
-	"config.discard",						\
-	"config.discard <configname>",					\
+#define CLI_VCL_DISCARD						\
+	"vcl.discard",						\
+	"vcl.discard <configname>",					\
 	"\tUnload the named configuration (when possible).",		\
 	1, 1
 
-#define CLI_CONFIG_LIST							\
-	"config.list",							\
-	"config.list",							\
+#define CLI_VCL_LIST							\
+	"vcl.list",							\
+	"vcl.list",							\
 	"\tList all loaded configuration.",				\
 	0, 0
 
-#define CLI_CONFIG_USE							\
-	"config.use",							\
-	"config.use <configname>",					\
+#define CLI_VCL_USE							\
+	"vcl.use",							\
+	"vcl.use <configname>",					\
 	"\tSwitch to the named configuration immediately.",		\
 	1, 1