From: phk Date: Wed, 12 Mar 2008 10:29:43 +0000 (+0000) Subject: Give cacher private cli functions a private prefix of "ccf" instead X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cbb089666ef529815909712bb12163bc7fa7b6e;p=varnish 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 0bcaca8d..536fb69f 100644 --- 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 f88075e9..d6e924ae 100644 --- 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 13628802..5bdf0cb7 100644 --- 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 b0cf289f..0e2c8437 100644 --- 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;