Give cacher private cli functions a private prefix of "ccf" instead

of overloading common cli function namespace "cli_func".

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

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index 0bcaca8deda83207d6440dbd6a1ae7786742e912..536fb69f5acd43ae3361cd5c12fc57bf1704eac2 100644 (file)
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -415,8 +415,8 @@ void VBE_SelectBackend(struct sess *sp);
 /* cache_ban.c */
 void AddBan(const char *, int hash);
 void BAN_Init(void);
-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 ccf_url_purge(struct cli *cli, const char * const *av, void *priv);
+void ccf_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);
 
@@ -559,10 +559,10 @@ void VCL_Idle(void);
 #undef VCL_RET_MAC
 
 #ifdef CLI_PRIV_H
-cli_func_t     cli_func_config_list;
-cli_func_t     cli_func_config_load;
-cli_func_t     cli_func_config_discard;
-cli_func_t     cli_func_config_use;
+cli_func_t     ccf_config_list;
+cli_func_t     ccf_config_load;
+cli_func_t     ccf_config_discard;
+cli_func_t     ccf_config_use;
 #endif
 
 /* cache_vrt_esi.c */

diff --git a/varnish-cache/bin/varnishd/cache_ban.c b/varnish-cache/bin/varnishd/cache_ban.c
index f88075e9b89f85d8b2cf8b572b45949d0f3393d5..d6e924ae0f873d2fedff9fe211cb013ab7b0f55f 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_ban.c
+++ b/varnish-cache/bin/varnishd/cache_ban.c
@@ -104,7 +104,7 @@ BAN_CheckObject(struct object *o, const char *url, const char *hash)
 }
 
 void
-cli_func_url_purge(struct cli *cli, const char * const *av, void *priv)
+ccf_url_purge(struct cli *cli, const char * const *av, void *priv)
 {
 
        (void)priv;
@@ -113,7 +113,7 @@ 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)
+ccf_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 13628802045f62dfc9c38a8e20158393b652ce35..5bdf0cb772116d872b4e270bee6a8535131ff7a9 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_cli.c
+++ b/varnish-cache/bin/varnishd/cache_cli.c
@@ -75,7 +75,7 @@ cli_debug_sizeof(struct cli *cli, const char * const *av, void *priv)
 /*--------------------------------------------------------------------*/
 
 static void
-cli_func_start(struct cli *cli, const char * const *av, void *priv)
+ccf_start(struct cli *cli, const char * const *av, void *priv)
 {
 
        (void)cli;
@@ -98,20 +98,20 @@ static void ccf_help(struct cli *cli, const char * const *av, void *priv);
 
 static struct cli_proto master_cmds[] = {
        { CLI_PING,             cli_func_ping },
-       { CLI_SERVER_START,     cli_func_start },
-       { 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 },
+       { CLI_SERVER_START,     ccf_start },
+       { CLI_VCL_LOAD,         ccf_config_load },
+       { CLI_VCL_LIST,         ccf_config_list },
+       { CLI_VCL_DISCARD,      ccf_config_discard },
+       { CLI_VCL_USE,          ccf_config_use },
        { NULL }
 };
 
 static struct cli_proto cacher_cmds[] = {
        { CLI_HELP,             ccf_help, NULL },
-       { CLI_URL_PURGE,        cli_func_url_purge },
-       { CLI_HASH_PURGE,       cli_func_hash_purge },
+       { CLI_URL_PURGE,        ccf_url_purge },
+       { CLI_HASH_PURGE,       ccf_hash_purge },
 #if 0
-       { CLI_URL_QUERY,        cli_func_url_query },
+       { CLI_URL_QUERY,        ccf_url_query },
 #endif
        { NULL }
 };

diff --git a/varnish-cache/bin/varnishd/cache_vcl.c b/varnish-cache/bin/varnishd/cache_vcl.c
index b0cf289f95c27b39b8ca01f8ffaa2f07b2d67589..0e2c8437e56d0744aa0216f6716d205e5891208b 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_vcl.c
+++ b/varnish-cache/bin/varnishd/cache_vcl.c
@@ -209,7 +209,7 @@ VCL_Idle(void)
 /*--------------------------------------------------------------------*/
 
 void
-cli_func_config_list(struct cli *cli, const char * const *av, void *priv)
+ccf_config_list(struct cli *cli, const char * const *av, void *priv)
 {
        struct vcls *vcl;
 
@@ -225,7 +225,7 @@ cli_func_config_list(struct cli *cli, const char * const *av, void *priv)
 }
 
 void
-cli_func_config_load(struct cli *cli, const char * const *av, void *priv)
+ccf_config_load(struct cli *cli, const char * const *av, void *priv)
 {
 
        (void)av;
@@ -237,7 +237,7 @@ cli_func_config_load(struct cli *cli, const char * const *av, void *priv)
 }
 
 void
-cli_func_config_discard(struct cli *cli, const char * const *av, void *priv)
+ccf_config_discard(struct cli *cli, const char * const *av, void *priv)
 {
        struct vcls *vcl;
 
@@ -264,7 +264,7 @@ cli_func_config_discard(struct cli *cli, const char * const *av, void *priv)
 }
 
 void
-cli_func_config_use(struct cli *cli, const char * const *av, void *priv)
+ccf_config_use(struct cli *cli, const char * const *av, void *priv)
 {
        struct vcls *vcl;