From: des <des@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Thu, 6 Jul 2006 08:41:26 +0000 (+0000)
Subject: Portability: cast unused parameters to void instead of marking them __unused.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df5ef40673176ed0ee28747c67c56375115a80c0;p=varnish

Portability: cast unused parameters to void instead of marking them __unused.

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

diff --git a/varnish-cache/bin/varnishd/cache_backend.c b/varnish-cache/bin/varnishd/cache_backend.c
index abda775f..9930cc6f 100644
--- a/varnish-cache/bin/varnishd/cache_backend.c
+++ b/varnish-cache/bin/varnishd/cache_backend.c
@@ -129,11 +129,14 @@ connect_to_backend(struct vbe_conn *vc, struct backend *bp)
  */
 
 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 @@ vbe_rdp(int fd, short event __unused, void *arg __unused)
  */
 
 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 @@ vbe_rdf(int fd, short event __unused, void *arg)
 /* 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);
 
diff --git a/varnish-cache/bin/varnishd/mgt_child.c b/varnish-cache/bin/varnishd/mgt_child.c
index 62695fe7..80a49bab 100644
--- a/varnish-cache/bin/varnishd/mgt_child.c
+++ b/varnish-cache/bin/varnishd/mgt_child.c
@@ -156,9 +156,11 @@ cli_rdcb(struct bufferevent *bev, void *arg)
 }
 
 static void
-cli_wrcb(struct bufferevent *bev __unused, void *arg __unused)
+cli_wrcb(struct bufferevent *bev, void *arg)
 {
 
+	(void)bev;
+	(void)arg;
 }
 
 static void
diff --git a/varnish-cache/bin/varnishd/varnishd.c b/varnish-cache/bin/varnishd/varnishd.c
index a6b93e66..f2746411 100644
--- a/varnish-cache/bin/varnishd/varnishd.c
+++ b/varnish-cache/bin/varnishd/varnishd.c
@@ -50,9 +50,11 @@ cli_passthrough_cb(unsigned u, const char *r, void *priv)
 }
 
 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 @@ vcl_default(const char *bflag)
 }
 
 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 @@ m_cli_func_config_inline(struct cli *cli, char **av, void *priv __unused)
 
 /* 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 @@ vcl_file(const char *fflag)
 /*--------------------------------------------------------------------*/
 
 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 @@ m_cli_func_ping(struct cli *cli, char **av, void *priv __unused)
 /*--------------------------------------------------------------------*/
 
 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));
diff --git a/varnish-cache/lib/libvarnish/argv.c b/varnish-cache/lib/libvarnish/argv.c
index 8448a8d9..29388f33 100644
--- a/varnish-cache/lib/libvarnish/argv.c
+++ b/varnish-cache/lib/libvarnish/argv.c
@@ -200,10 +200,13 @@ Test(const char *str)
 }
 
 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))