r2036 - in trunk/varnish-cache: bin/varnishd include lib/libvarnish
phk at projects.linpro.no
phk at projects.linpro.no
Tue Sep 25 12:25:51 CEST 2007
Author: phk
Date: 2007-09-25 12:25:51 +0200 (Tue, 25 Sep 2007)
New Revision: 2036
Modified:
trunk/varnish-cache/bin/varnishd/cache.h
trunk/varnish-cache/bin/varnishd/cache_ban.c
trunk/varnish-cache/bin/varnishd/cache_cli.c
trunk/varnish-cache/bin/varnishd/cache_pool.c
trunk/varnish-cache/bin/varnishd/cache_vcl.c
trunk/varnish-cache/bin/varnishd/mgt_child.c
trunk/varnish-cache/bin/varnishd/mgt_cli.c
trunk/varnish-cache/bin/varnishd/mgt_param.c
trunk/varnish-cache/bin/varnishd/mgt_vcc.c
trunk/varnish-cache/include/cli_priv.h
trunk/varnish-cache/lib/libvarnish/cli.c
trunk/varnish-cache/lib/libvarnish/cli_common.c
Log:
Make the arguments to CLI functions const-const.
Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h 2007-09-25 10:24:34 UTC (rev 2035)
+++ trunk/varnish-cache/bin/varnishd/cache.h 2007-09-25 10:25:51 UTC (rev 2036)
@@ -413,8 +413,8 @@
/* cache_ban.c */
void AddBan(const char *, int hash);
void BAN_Init(void);
-void cli_func_url_purge(struct cli *cli, char **av, void *priv);
-void cli_func_hash_purge(struct cli *cli, char **av, void *priv);
+void cli_func_url_purge(struct cli *cli, const char * const *av, void *priv);
+void cli_func_hash_purge(struct cli *cli, const char * const *av, void *priv);
void BAN_NewObj(struct object *o);
int BAN_CheckObject(struct object *o, const char *url, const char *hash);
Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c 2007-09-25 10:24:34 UTC (rev 2035)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c 2007-09-25 10:25:51 UTC (rev 2036)
@@ -102,7 +102,7 @@
}
void
-cli_func_url_purge(struct cli *cli, char **av, void *priv)
+cli_func_url_purge(struct cli *cli, const char * const *av, void *priv)
{
(void)priv;
@@ -111,7 +111,7 @@
}
void
-cli_func_hash_purge(struct cli *cli, char **av, void *priv)
+cli_func_hash_purge(struct cli *cli, const char * const *av, void *priv)
{
(void)priv;
Modified: trunk/varnish-cache/bin/varnishd/cache_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_cli.c 2007-09-25 10:24:34 UTC (rev 2035)
+++ trunk/varnish-cache/bin/varnishd/cache_cli.c 2007-09-25 10:25:51 UTC (rev 2036)
@@ -47,7 +47,7 @@
/*--------------------------------------------------------------------*/
static void
-cli_func_start(struct cli *cli, char **av, void *priv)
+cli_func_start(struct cli *cli, const char * const *av, void *priv)
{
(void)cli;
Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c 2007-09-25 10:24:34 UTC (rev 2035)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c 2007-09-25 10:25:51 UTC (rev 2036)
@@ -434,7 +434,7 @@
/*--------------------------------------------------------------------*/
void
-cli_func_dump_pool(struct cli *cli, char **av, void *priv)
+cli_func_dump_pool(struct cli *cli, const char * const *av, void *priv)
{
(void)cli;
Modified: trunk/varnish-cache/bin/varnishd/cache_vcl.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vcl.c 2007-09-25 10:24:34 UTC (rev 2035)
+++ trunk/varnish-cache/bin/varnishd/cache_vcl.c 2007-09-25 10:25:51 UTC (rev 2036)
@@ -195,7 +195,7 @@
/*--------------------------------------------------------------------*/
void
-cli_func_config_list(struct cli *cli, char **av, void *priv)
+cli_func_config_list(struct cli *cli, const char * const *av, void *priv)
{
struct vcls *vcl;
@@ -210,7 +210,7 @@
}
void
-cli_func_config_load(struct cli *cli, char **av, void *priv)
+cli_func_config_load(struct cli *cli, const char * const *av, void *priv)
{
(void)av;
@@ -221,7 +221,7 @@
}
void
-cli_func_config_discard(struct cli *cli, char **av, void *priv)
+cli_func_config_discard(struct cli *cli, const char * const *av, void *priv)
{
struct vcls *vcl;
@@ -257,7 +257,7 @@
}
void
-cli_func_config_use(struct cli *cli, char **av, void *priv)
+cli_func_config_use(struct cli *cli, const char * const *av, void *priv)
{
struct vcls *vcl;
Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c 2007-09-25 10:24:34 UTC (rev 2035)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c 2007-09-25 10:25:51 UTC (rev 2036)
@@ -435,7 +435,7 @@
/*--------------------------------------------------------------------*/
void
-mcf_server_startstop(struct cli *cli, char **av, void *priv)
+mcf_server_startstop(struct cli *cli, const char * const *av, void *priv)
{
(void)av;
@@ -452,7 +452,7 @@
/*--------------------------------------------------------------------*/
void
-mcf_server_status(struct cli *cli, char **av, void *priv)
+mcf_server_status(struct cli *cli, const char * const *av, void *priv)
{
(void)av;
(void)priv;
Modified: trunk/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_cli.c 2007-09-25 10:24:34 UTC (rev 2035)
+++ trunk/varnish-cache/bin/varnishd/mgt_cli.c 2007-09-25 10:25:51 UTC (rev 2036)
@@ -62,7 +62,7 @@
/*--------------------------------------------------------------------*/
static void
-mcf_stats(struct cli *cli, char **av, void *priv)
+mcf_stats(struct cli *cli, const char * const *av, void *priv)
{
(void)av;
@@ -82,10 +82,11 @@
*/
static void
-mcf_passthru(struct cli *cli, char **av, void *priv)
+mcf_passthru(struct cli *cli, const char * const *av, void *priv)
{
struct vsb *sb;
- char *p;
+ const char *p;
+ char *q;
unsigned u;
int i;
@@ -127,10 +128,10 @@
xxxassert(i == vsb_len(sb));
vsb_delete(sb);
- i = cli_readres(cli_i, &u, &p, params->cli_timeout);
+ i = cli_readres(cli_i, &u, &q, params->cli_timeout);
cli_result(cli, u);
- cli_out(cli, "%s", p);
- free(p);
+ cli_out(cli, "%s", q);
+ free(q);
}
Modified: trunk/varnish-cache/bin/varnishd/mgt_param.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_param.c 2007-09-25 10:24:34 UTC (rev 2035)
+++ trunk/varnish-cache/bin/varnishd/mgt_param.c 2007-09-25 10:25:51 UTC (rev 2036)
@@ -766,7 +766,7 @@
/*--------------------------------------------------------------------*/
void
-mcf_param_show(struct cli *cli, char **av, void *priv)
+mcf_param_show(struct cli *cli, const char * const *av, void *priv)
{
struct parspec *pp;
const char *p, *q;
@@ -854,7 +854,7 @@
/*--------------------------------------------------------------------*/
void
-mcf_param_set(struct cli *cli, char **av, void *priv)
+mcf_param_set(struct cli *cli, const char * const *av, void *priv)
{
(void)priv;
Modified: trunk/varnish-cache/bin/varnishd/mgt_vcc.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_vcc.c 2007-09-25 10:24:34 UTC (rev 2035)
+++ trunk/varnish-cache/bin/varnishd/mgt_vcc.c 2007-09-25 10:25:51 UTC (rev 2036)
@@ -474,7 +474,7 @@
/*--------------------------------------------------------------------*/
void
-mcf_config_inline(struct cli *cli, char **av, void *priv)
+mcf_config_inline(struct cli *cli, const char * const *av, void *priv)
{
char *vf, *p;
struct vsb *sb;
@@ -504,7 +504,7 @@
}
void
-mcf_config_load(struct cli *cli, char **av, void *priv)
+mcf_config_load(struct cli *cli, const char * const *av, void *priv)
{
char *vf;
struct vsb *sb;
@@ -550,7 +550,7 @@
}
void
-mcf_config_use(struct cli *cli, char **av, void *priv)
+mcf_config_use(struct cli *cli, const char * const *av, void *priv)
{
unsigned status;
char *p;
@@ -577,7 +577,7 @@
}
void
-mcf_config_discard(struct cli *cli, char **av, void *priv)
+mcf_config_discard(struct cli *cli, const char * const *av, void *priv)
{
unsigned status;
char *p;
@@ -602,7 +602,7 @@
}
void
-mcf_config_list(struct cli *cli, char **av, void *priv)
+mcf_config_list(struct cli *cli, const char * const *av, void *priv)
{
unsigned status;
char *p;
@@ -628,7 +628,7 @@
* XXX: This should take an option argument to show all (include) files
*/
void
-mcf_config_show(struct cli *cli, char **av, void *priv)
+mcf_config_show(struct cli *cli, const char * const *av, void *priv)
{
struct vclprog *vp;
void *dlh, *sym;
Modified: trunk/varnish-cache/include/cli_priv.h
===================================================================
--- trunk/varnish-cache/include/cli_priv.h 2007-09-25 10:24:34 UTC (rev 2035)
+++ trunk/varnish-cache/include/cli_priv.h 2007-09-25 10:25:51 UTC (rev 2036)
@@ -37,7 +37,7 @@
struct cli; /* NB: struct cli is opaque at this level. */
-typedef void cli_func_t(struct cli*, char **av, void *priv);
+typedef void cli_func_t(struct cli*, const char * const *av, void *priv);
struct cli_proto {
/* These must match the CLI_* macros in cli.h */
Modified: trunk/varnish-cache/lib/libvarnish/cli.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/cli.c 2007-09-25 10:24:34 UTC (rev 2035)
+++ trunk/varnish-cache/lib/libvarnish/cli.c 2007-09-25 10:25:51 UTC (rev 2036)
@@ -46,7 +46,7 @@
*/
void
-cli_func_help(struct cli *cli, char **av, void *priv)
+cli_func_help(struct cli *cli, const char * const *av, void *priv)
{
struct cli_proto *cp;
@@ -123,7 +123,7 @@
break;
}
- cp->func(cli, av, cp->priv);
+ cp->func(cli, (const char * const *)av, cp->priv);
} while (0);
FreeArgv(av);
Modified: trunk/varnish-cache/lib/libvarnish/cli_common.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/cli_common.c 2007-09-25 10:24:34 UTC (rev 2035)
+++ trunk/varnish-cache/lib/libvarnish/cli_common.c 2007-09-25 10:25:51 UTC (rev 2036)
@@ -179,7 +179,7 @@
/*--------------------------------------------------------------------*/
void
-cli_func_ping(struct cli *cli, char **av, void *priv)
+cli_func_ping(struct cli *cli, const char * const *av, void *priv)
{
time_t t;
More information about the varnish-commit
mailing list