r116 - trunk/varnish-cache/bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2006-04-04 12:09:37 +0200 (Tue, 04 Apr 2006)
New Revision: 116

Modified:
   trunk/varnish-cache/bin/varnishd/cache_acceptor.c
   trunk/varnish-cache/bin/varnishd/cache_backend.c
   trunk/varnish-cache/bin/varnishd/cache_main.c
   trunk/varnish-cache/bin/varnishd/cache_pool.c
   trunk/varnish-cache/bin/varnishd/mgt_child.c
Log:
More portability changes: include config.h and compat.h, get rid of __unused.

Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2006-04-04 10:08:49 UTC (rev 115)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor.c	2006-04-04 10:09:37 UTC (rev 116)
@@ -16,6 +16,8 @@
 #include <sbuf.h>
 #include <event.h>
 
+#include "config.h"
+#include "compat.h"
 #include "libvarnish.h"
 #include "vcl_lang.h"
 #include "heritage.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_backend.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend.c	2006-04-04 10:08:49 UTC (rev 115)
+++ trunk/varnish-cache/bin/varnishd/cache_backend.c	2006-04-04 10:09:37 UTC (rev 116)
@@ -2,17 +2,18 @@
  * $Id$
  */
 
-#include <assert.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+
+#include <assert.h>
 #include <netdb.h>
+#include <pthread.h>
+#include <queue.h>
 #include <sbuf.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "libvarnish.h"
 #include "vcl_lang.h"

Modified: trunk/varnish-cache/bin/varnishd/cache_main.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_main.c	2006-04-04 10:08:49 UTC (rev 115)
+++ trunk/varnish-cache/bin/varnishd/cache_main.c	2006-04-04 10:09:37 UTC (rev 116)
@@ -53,9 +53,10 @@
 /*--------------------------------------------------------------------*/
 
 static void
-cli_func_url_query(struct cli *cli, char **av, void *priv __unused)
+cli_func_url_query(struct cli *cli, char **av, void *priv)
 {
 
+	(void)priv;
 	cli_out(cli, "url <%s>", av[2]);
 	cli_result(cli, CLIS_UNIMPL);
 }
@@ -63,10 +64,11 @@
 /*--------------------------------------------------------------------*/
 
 static void
-cli_func_ping(struct cli *cli, char **av, void *priv __unused)
+cli_func_ping(struct cli *cli, char **av, void *priv)
 {
 	time_t t;
 
+	(void)priv;
 	VSL(SLT_CLI, 0, av[1]);
 	arm_keepalive();
 	if (av[2] != NULL) {

Modified: trunk/varnish-cache/bin/varnishd/cache_pool.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_pool.c	2006-04-04 10:08:49 UTC (rev 115)
+++ trunk/varnish-cache/bin/varnishd/cache_pool.c	2006-04-04 10:09:37 UTC (rev 116)
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <pthread.h>
+#include <queue.h>
 
 #include "libvarnish.h"
 #include "vcl_lang.h"
@@ -15,10 +16,11 @@
 static pthread_cond_t	shdcnd;
 
 static void *
-CacheWorker(void *priv __unused)
+CacheWorker(void *priv)
 {
 	struct sess *sp;
 
+	(void)priv;
 	AZ(pthread_mutex_lock(&sessmtx));
 	while (1) {
 		while (1) {

Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c	2006-04-04 10:08:49 UTC (rev 115)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c	2006-04-04 10:09:37 UTC (rev 116)
@@ -16,7 +16,7 @@
 #include <unistd.h>
 
 #include <sys/wait.h>
-#include <sys/queue.h>
+#include <queue.h>
 
 #include <event.h>
 #include <sbuf.h>