r162 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-05-01 14:27:51 +0200 (Mon, 01 May 2006)
New Revision: 162

Modified:
   trunk/varnish-cache/bin/varnishd/varnishd.c
Log:
bandaid for name-clash


Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2006-05-01 12:27:30 UTC (rev 161)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2006-05-01 12:27:51 UTC (rev 162)
@@ -138,8 +138,9 @@
 	    "config.load %s %s", av[2], vf);
 }
 
+/* XXX: m prefix to avoid name clash */
 static void
-cli_func_config_load(struct cli *cli, char **av, void *priv __unused)
+m_cli_func_config_load(struct cli *cli, char **av, void *priv __unused)
 {
 	char *vf;
 	struct sbuf *sb;
@@ -226,7 +227,7 @@
 	{ CLI_URL_QUERY,	cli_func_passthrough, NULL },
 	{ CLI_URL_PURGE,	cli_func_passthrough, NULL },
 	{ CLI_URL_STATUS,	cli_func_passthrough, NULL },
-	{ CLI_CONFIG_LOAD,	cli_func_config_load, NULL },
+	{ CLI_CONFIG_LOAD,	m_cli_func_config_load, NULL },
 	{ CLI_CONFIG_INLINE,	cli_func_config_inline, NULL },
 	{ CLI_CONFIG_UNLOAD,	cli_func_passthrough, NULL },
 	{ CLI_CONFIG_LIST,	cli_func_passthrough, NULL },