Make the arguments to CLI functions const-const.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2036 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index 499c2ef27ade9ee9d9953e9bf61031d8a125d62d..a511ba9b6d052b054c012641ad1e8163e5dab35c 100644 (file)
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -413,8 +413,8 @@ extern struct backend_method        backend_method_round_robin;
 /* 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);
 

diff --git a/varnish-cache/bin/varnishd/cache_ban.c b/varnish-cache/bin/varnishd/cache_ban.c
index 2cd7ffa839dd852ca55510b66edc1cd7b2de27eb..2bdc77efe0e1105b7be884a0609084b37c2c9c01 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_ban.c
+++ b/varnish-cache/bin/varnishd/cache_ban.c
@@ -102,7 +102,7 @@ BAN_CheckObject(struct object *o, const char *url, const char *hash)
 }
 
 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 @@ cli_func_url_purge(struct cli *cli, char **av, void *priv)
 }
 
 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;

diff --git a/varnish-cache/bin/varnishd/cache_cli.c b/varnish-cache/bin/varnishd/cache_cli.c
index 8eb7cfe933fb4ba0e135929b227b48f3c4ad40b9..aabe8d81c26adeda2a40a52f2aad7af77ab735ce 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_cli.c
+++ b/varnish-cache/bin/varnishd/cache_cli.c
@@ -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;

diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index 2a5de71a858d72e2c6605e15fc0178a2fdab7bd9..cc0c1c52d7f954619fa7a4fab725bb2942c034f8 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -434,7 +434,7 @@ WRK_Init(void)
 /*--------------------------------------------------------------------*/
 
 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;

diff --git a/varnish-cache/bin/varnishd/cache_vcl.c b/varnish-cache/bin/varnishd/cache_vcl.c
index 052224b1f983f854b1da819b5a8605c8384afcd1..7be68f6775bdddedd534d4a819f7d6129bba37c3 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_vcl.c
+++ b/varnish-cache/bin/varnishd/cache_vcl.c
@@ -195,7 +195,7 @@ VCL_Load(const char *fn, const char *name, struct cli *cli)
 /*--------------------------------------------------------------------*/
 
 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 @@ cli_func_config_list(struct cli *cli, char **av, void *priv)
 }
 
 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 @@ cli_func_config_load(struct cli *cli, char **av, void *priv)
 }
 
 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 @@ cli_func_config_discard(struct cli *cli, char **av, void *priv)
 }
 
 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;
 

diff --git a/varnish-cache/bin/varnishd/mgt_child.c b/varnish-cache/bin/varnishd/mgt_child.c
index 2072ec733883523bd3d84a7fda3a600a616f7e2c..b14cbb6cc2ffcbff37b02a90889656d34b7da4c8 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_child.c
+++ b/varnish-cache/bin/varnishd/mgt_child.c
@@ -435,7 +435,7 @@ mgt_run(int dflag, const char *T_arg)
 /*--------------------------------------------------------------------*/
 
 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 @@ mcf_server_startstop(struct cli *cli, char **av, void *priv)
 /*--------------------------------------------------------------------*/
 
 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;

diff --git a/varnish-cache/bin/varnishd/mgt_cli.c b/varnish-cache/bin/varnishd/mgt_cli.c
index c6ac6828d4174303db215eed716a80b7de5748ec..38f4e79bfdf92d71fe55b855e637d45f7fbf507d 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_cli.c
+++ b/varnish-cache/bin/varnishd/mgt_cli.c
@@ -62,7 +62,7 @@ static int            cli_i = -1, cli_o = -1;
 /*--------------------------------------------------------------------*/
 
 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 @@ mcf_stats(struct cli *cli, char **av, void *priv)
  */
 
 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 @@ mcf_passthru(struct cli *cli, char **av, void *priv)
        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);
 
 }
 

diff --git a/varnish-cache/bin/varnishd/mgt_param.c b/varnish-cache/bin/varnishd/mgt_param.c
index 911380b75c3fdd8fc9555a2ccd7db3aa98d34b04..fa8d9ff737ea4e63c74bde4c13b38a652cab776c 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_param.c
+++ b/varnish-cache/bin/varnishd/mgt_param.c
@@ -766,7 +766,7 @@ static struct parspec parspec[] = {
 /*--------------------------------------------------------------------*/
 
 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 @@ MCF_ParamSet(struct cli *cli, const char *param, const char *val)
 /*--------------------------------------------------------------------*/
 
 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;

diff --git a/varnish-cache/bin/varnishd/mgt_vcc.c b/varnish-cache/bin/varnishd/mgt_vcc.c
index c8d27f3727dc9952ab45ce6a8a8a8b6870ad58a2..cc1d50a61732288b879be6240c8cf5952b58ea30 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_vcc.c
+++ b/varnish-cache/bin/varnishd/mgt_vcc.c
@@ -474,7 +474,7 @@ mgt_vcc_init(void)
 /*--------------------------------------------------------------------*/
 
 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 @@ mcf_config_inline(struct cli *cli, char **av, void *priv)
 }
 
 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 @@ mcf_find_vcl(struct cli *cli, const char *name)
 }
 
 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 @@ mcf_config_use(struct cli *cli, char **av, void *priv)
 }
 
 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 @@ mcf_config_discard(struct cli *cli, char **av, void *priv)
 }
 
 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 @@ mcf_config_list(struct cli *cli, char **av, void *priv)
  * 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;

diff --git a/varnish-cache/include/cli_priv.h b/varnish-cache/include/cli_priv.h
index 603901d74518ea04fcd0a29cffc18da76cf77f8f..0cc1fd6c916c6822d28743105cf36f5040cb1a9a 100644 (file)
--- a/varnish-cache/include/cli_priv.h
+++ b/varnish-cache/include/cli_priv.h
@@ -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 */

diff --git a/varnish-cache/lib/libvarnish/cli.c b/varnish-cache/lib/libvarnish/cli.c
index 4d15fb429964e101aaed4da9ac886615a977b811..10a715b69a3417c056171b3f65978f8f7efa48b1 100644 (file)
--- a/varnish-cache/lib/libvarnish/cli.c
+++ b/varnish-cache/lib/libvarnish/cli.c
@@ -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 @@ cli_dispatch(struct cli *cli, struct cli_proto *clp, const char *line)
                        break;
                }
 
-               cp->func(cli, av, cp->priv);
+               cp->func(cli, (const char * const *)av, cp->priv);
 
        } while (0);
        FreeArgv(av);

diff --git a/varnish-cache/lib/libvarnish/cli_common.c b/varnish-cache/lib/libvarnish/cli_common.c
index 1e17b5b6778d9fad2759b1a8ca55eac4768963ff..69922fcbdae89be6c5696cb1e4066ffd3f90a85d 100644 (file)
--- a/varnish-cache/lib/libvarnish/cli_common.c
+++ b/varnish-cache/lib/libvarnish/cli_common.c
@@ -179,7 +179,7 @@ cli_readres(int fd, unsigned *status, char **ptr, double tmo)
 /*--------------------------------------------------------------------*/
 
 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;