Mailing List Archive

Author: phk
Date: 2008-03-12 11:29:43 +0100 (Wed, 12 Mar 2008)
New Revision: 2596

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_vcl.c
Log:
Give cacher private cli functions a private prefix of "ccf" instead
of overloading common cli function namespace "cli_func".


Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h 2008-03-12 10:25:51 UTC (rev 2595)
+++ trunk/varnish-cache/bin/varnishd/cache.h 2008-03-12 10:29:43 UTC (rev 2596)
@@ -415,8 +415,8 @@
/* 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 @@
#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 */

Modified: trunk/varnish-cache/bin/varnishd/cache_ban.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ban.c 2008-03-12 10:25:51 UTC (rev 2595)
+++ trunk/varnish-cache/bin/varnishd/cache_ban.c 2008-03-12 10:29:43 UTC (rev 2596)
@@ -104,7 +104,7 @@
}

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 @@
}

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;

Modified: trunk/varnish-cache/bin/varnishd/cache_cli.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_cli.c 2008-03-12 10:25:51 UTC (rev 2595)
+++ trunk/varnish-cache/bin/varnishd/cache_cli.c 2008-03-12 10:29:43 UTC (rev 2596)
@@ -75,7 +75,7 @@
/*--------------------------------------------------------------------*/

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 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 }
};

Modified: trunk/varnish-cache/bin/varnishd/cache_vcl.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vcl.c 2008-03-12 10:25:51 UTC (rev 2595)
+++ trunk/varnish-cache/bin/varnishd/cache_vcl.c 2008-03-12 10:29:43 UTC (rev 2596)
@@ -209,7 +209,7 @@
/*--------------------------------------------------------------------*/

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 @@
}

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 @@
}

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 @@
}

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;