Mailing List Archive

Author: phk
Date: 2008-06-05 11:18:09 +0200 (Thu, 05 Jun 2008)
New Revision: 2649

Modified:
trunk/varnish-cache/bin/varnishd/cache_acceptor.c
Log:
We don't need srandomdev.h here anymore.

Don't hand-roll an assert.


Modified: trunk/varnish-cache/bin/varnishd/cache_acceptor.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_acceptor.c 2008-06-05 09:16:29 UTC (rev 2648)
+++ trunk/varnish-cache/bin/varnishd/cache_acceptor.c 2008-06-05 09:18:09 UTC (rev 2649)
@@ -46,10 +46,6 @@
#include <sys/types.h>
#include <sys/socket.h>

-#ifndef HAVE_SRANDOMDEV
-#include "compat/srandomdev.h"
-#endif
-
#include "cli.h"
#include "cli_priv.h"
#include "shmlog.h"
@@ -294,10 +290,9 @@
/* XXX: Add selector mechanism at some point */
vca_act = vca_acceptors[0];

- if (vca_act->name == NULL) {
- fprintf(stderr, "No acceptor in program\n");
- exit (2);
- }
+ AN(vca_act);
+ AN(vca_act->name);
+
if (vca_act->pass == NULL)
AZ(pipe(vca_pipes));
vca_act->init();