r337 - in trunk/varnish-cache: bin/varnishd lib/libvarnish

[des at projects.linpro.no]

Author: des
Date: 2006-07-06 10:41:26 +0200 (Thu, 06 Jul 2006)
New Revision: 337

Modified:
   trunk/varnish-cache/bin/varnishd/cache_backend.c
   trunk/varnish-cache/bin/varnishd/mgt_child.c
   trunk/varnish-cache/bin/varnishd/varnishd.c
   trunk/varnish-cache/lib/libvarnish/argv.c
Log:
Portability: cast unused parameters to void instead of marking them __unused.

Modified: trunk/varnish-cache/bin/varnishd/cache_backend.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend.c	2006-07-06 08:32:38 UTC (rev 336)
+++ trunk/varnish-cache/bin/varnishd/cache_backend.c	2006-07-06 08:41:26 UTC (rev 337)
@@ -129,11 +129,14 @@
  */
 
 static void
-vbe_rdp(int fd, short event __unused, void *arg __unused)
+vbe_rdp(int fd, short event, void *arg)
 {
 	struct vbe_conn *vc;
 	int i;
 
+	(void)event;
+	(void)arg;
+
 	i = read(fd, &vc, sizeof vc);
 	assert(i == sizeof vc);
 	AZ(pthread_mutex_lock(&vbemtx));
@@ -157,11 +160,13 @@
  */
 
 static void
-vbe_rdf(int fd, short event __unused, void *arg)
+vbe_rdf(int fd, short event, void *arg)
 {
 	struct vbe_conn *vc;
 	int j;
 
+	(void)event;
+
 	vc = arg;
 	AZ(pthread_mutex_lock(&vbemtx));
 	if (vc->inuse) {
@@ -182,10 +187,12 @@
 /* Backend monitoring thread -----------------------------------------*/
 
 static void *
-vbe_main(void *priv __unused)
+vbe_main(void *priv)
 {
 	struct event pev;
 
+	(void)priv;
+
 	vbe_evb = event_init();
 	assert(vbe_evb != NULL);
 

Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c	2006-07-06 08:32:38 UTC (rev 336)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c	2006-07-06 08:41:26 UTC (rev 337)
@@ -156,9 +156,11 @@
 }
 
 static void
-cli_wrcb(struct bufferevent *bev __unused, void *arg __unused)
+cli_wrcb(struct bufferevent *bev, void *arg)
 {
 
+	(void)bev;
+	(void)arg;
 }
 
 static void

Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2006-07-06 08:32:38 UTC (rev 336)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2006-07-06 08:41:26 UTC (rev 337)
@@ -50,9 +50,11 @@
 }
 
 static void
-m_cli_func_passthrough(struct cli *cli, char **av __unused, void *priv)
+m_cli_func_passthrough(struct cli *cli, char **av, void *priv)
 {
 
+	(void)av;
+
 	cli_suspend(cli);
 	mgt_child_request(cli_passthrough_cb, cli, &av[2], av[1]);
 }
@@ -129,11 +131,13 @@
 }
 
 static void
-m_cli_func_config_inline(struct cli *cli, char **av, void *priv __unused)
+m_cli_func_config_inline(struct cli *cli, char **av, void *priv)
 {
 	char *vf;
 	struct sbuf *sb;
 
+	(void)priv;
+
 	sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
 	assert(sb != NULL);
 	vf = VCC_Compile(sb, av[3], NULL);
@@ -151,11 +155,13 @@
 
 /* XXX: m prefix to avoid name clash */
 static void
-m_cli_func_config_load(struct cli *cli, char **av, void *priv __unused)
+m_cli_func_config_load(struct cli *cli, char **av, void *priv)
 {
 	char *vf;
 	struct sbuf *sb;
 
+	(void)priv;
+
 	sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
 	assert(sb != NULL);
 	vf = VCC_CompileFile(sb, av[3]);
@@ -194,36 +200,49 @@
 /*--------------------------------------------------------------------*/
 
 static void
-m_cli_func_server_start(struct cli *cli, char **av __unused, void *priv __unused)
+m_cli_func_server_start(struct cli *cli, char **av, void *priv)
 {
 
+	(void)cli;
+	(void)av;
+	(void)priv;
+
 	mgt_child_start();
 }
 
 /*--------------------------------------------------------------------*/
 
 static void
-m_cli_func_server_stop(struct cli *cli, char **av __unused, void *priv __unused)
+m_cli_func_server_stop(struct cli *cli, char **av, void *priv)
 {
 
+	(void)cli;
+	(void)av;
+	(void)priv;
+
 	mgt_child_stop();
 }
 
 /*--------------------------------------------------------------------*/
 
 static void
-m_cli_func_verbose(struct cli *cli, char **av __unused, void *priv)
+m_cli_func_verbose(struct cli *cli, char **av, void *priv)
 {
 
+	(void)av;
+	(void)priv;
+
 	cli->verbose = !cli->verbose;
 }
 
 
 static void
-m_cli_func_ping(struct cli *cli, char **av, void *priv __unused)
+m_cli_func_ping(struct cli *cli, char **av, void *priv)
 {
 	time_t t;
 
+	(void)priv;
+
 	if (av[2] != NULL) {
 		cli_out(cli, "Got your %s\n", av[2]);
 	} 
@@ -234,9 +253,12 @@
 /*--------------------------------------------------------------------*/
 
 static void
-m_cli_func_stats(struct cli *cli, char **av, void *priv __unused)
+m_cli_func_stats(struct cli *cli, char **av, void *priv)
 {
 
+	(void)av;
+	(void)priv;
+
 	assert (VSL_stats != NULL);
 #define MAC_STAT(n,t,f,d) \
     cli_out(cli, "%12ju  " d "\n", (VSL_stats->n));

Modified: trunk/varnish-cache/lib/libvarnish/argv.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/argv.c	2006-07-06 08:32:38 UTC (rev 336)
+++ trunk/varnish-cache/lib/libvarnish/argv.c	2006-07-06 08:41:26 UTC (rev 337)
@@ -200,10 +200,13 @@
 }
 
 int
-main(int argc __unused, char **argv __unused)
+main(int argc, char **argv)
 {
 	char buf[BUFSIZ];
 
+	(void)argc;
+	(void)argv;
+
         register_printf_render_std("V");
 
 	while (fgets(buf, sizeof buf, stdin))