[master] b616a4d Remove initialization of unused priv arguments

Poul-Henning Kamp phk at FreeBSD.org
Thu Feb 4 02:55:26 CET 2016


commit b616a4dd34aa6860f535d1a71b10e59143e92829
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Feb 4 00:23:53 2016 +0000

    Remove initialization of unused priv arguments

diff --git a/bin/varnishd/cache/cache_acceptor.c b/bin/varnishd/cache/cache_acceptor.c
index a17351d..de768f2 100644
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -561,7 +561,7 @@ static struct cli_proto vca_cmds[] = {
 	{ CLI_SERVER_START,	"i", ccf_start },
 	{ "debug.listen_address", "debug.listen_address",
 	    "\tReport the actual listen address.", 0, 0,
-	    "d", ccf_listen_address, NULL },
+	    "d", ccf_listen_address },
 	{ NULL }
 };
 
diff --git a/bin/varnishd/mgt/mgt_cli.c b/bin/varnishd/mgt/mgt_cli.c
index 2317822..baae752 100644
--- a/bin/varnishd/mgt/mgt_cli.c
+++ b/bin/varnishd/mgt/mgt_cli.c
@@ -121,7 +121,7 @@ mcf_panic(struct cli *cli, const char * const *av, void *priv)
 static struct cli_proto cli_debug[] = {
 	{ "debug.panic.master", "debug.panic.master",
 		"\tPanic the master process.",
-		0, 0, "d", mcf_panic, NULL},
+		0, 0, "d", mcf_panic},
 	{ NULL }
 };
 
@@ -177,7 +177,7 @@ mcf_askchild(struct cli *cli, const char * const *av, void *priv)
 
 static struct cli_proto cli_askchild[] = {
 	{ "*", "<wild-card-entry>", "\t<fall through to cacher>\n",
-		0, 9999, "h*", mcf_askchild, NULL},
+		0, 9999, "h*", mcf_askchild},
 	{ NULL }
 };
 
@@ -308,10 +308,10 @@ mcf_auth(struct cli *cli, const char *const *av, void *priv)
 }
 
 static struct cli_proto cli_auth[] = {
-	{ CLI_HELP,		"", VCLS_func_help, NULL },
+	{ CLI_HELP,		"", VCLS_func_help },
 	{ CLI_PING,		"", VCLS_func_ping },
-	{ CLI_AUTH,		"", mcf_auth, NULL },
-	{ CLI_QUIT,		"", VCLS_func_close, NULL},
+	{ CLI_AUTH,		"", mcf_auth },
+	{ CLI_QUIT,		"", VCLS_func_close },
 	{ NULL }
 };
 



More information about the varnish-commit mailing list