r3997 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-03-23 15:40:52 +0100 (Mon, 23 Mar 2009)
New Revision: 3997

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
Log:
Merge r3974: Don't trust EV_SET macro to only evaluate its arguments once, at
least on NetBSD this is not the case.

Fixes #474



Modified: branches/2.0/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c	2009-03-23 14:33:56 UTC (rev 3996)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_acceptor_kqueue.c	2009-03-23 14:40:52 UTC (rev 3997)
@@ -159,8 +159,10 @@
 	assert(kq >= 0);
 
 	j = 0;
-	EV_SET(&ke[j++], 0, EVFILT_TIMER, EV_ADD, 0, 100, NULL);
-	EV_SET(&ke[j++], vca_pipes[0], EVFILT_READ, EV_ADD, 0, 0, vca_pipes);
+	EV_SET(&ke[j], 0, EVFILT_TIMER, EV_ADD, 0, 100, NULL);
+	j++;
+	EV_SET(&ke[j], vca_pipes[0], EVFILT_READ, EV_ADD, 0, 0, vca_pipes);
+	j++;
 	AZ(kevent(kq, ke, j, NULL, 0, NULL));
 
 	nki = 0;