delete excessive evtimer_pending; ok claudio

6 files changed, 12 insertions, 18 deletions

diff --git a/usr.sbin/dvmrpd/control.c b/usr.sbin/dvmrpd/control.c
index 2e2b52370ab..7d3fd7dc37f 100644
--- a/usr.sbin/dvmrpd/control.c
+++ b/usr.sbin/dvmrpd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.15 2012/04/10 07:56:54 deraadt Exp $ */
+/*	$OpenBSD: control.c,v 1.16 2012/04/11 08:34:41 deraadt Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -105,8 +105,7 @@ void
 control_cleanup(void)
 {
 	event_del(&control_state.ev);
-	if (evtimer_pending(&control_state.evt, NULL))
-		event_del(&control_state.evt);
+	event_del(&control_state.evt);
 	unlink(DVMRPD_SOCKET);
 }
 
diff --git a/usr.sbin/ospf6d/control.c b/usr.sbin/ospf6d/control.c
index a6e2107f3d6..4bf2c4be8e2 100644
--- a/usr.sbin/ospf6d/control.c
+++ b/usr.sbin/ospf6d/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.17 2012/04/10 07:56:50 deraadt Exp $ */
+/*	$OpenBSD: control.c,v 1.18 2012/04/11 08:33:53 deraadt Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -103,8 +103,7 @@ void
 control_cleanup(void)
 {
 	event_del(&control_state.ev);
-	if (evtimer_pending(&control_state.evt, NULL))
-		event_del(&control_state.evt);
+	event_del(&control_state.evt);
 	unlink(OSPF6D_SOCKET);
 }
 
diff --git a/usr.sbin/ospfd/control.c b/usr.sbin/ospfd/control.c
index a06a9b4e9b4..a5d75a4bd34 100644
--- a/usr.sbin/ospfd/control.c
+++ b/usr.sbin/ospfd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.36 2012/04/10 07:56:54 deraadt Exp $ */
+/*	$OpenBSD: control.c,v 1.37 2012/04/11 08:33:53 deraadt Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -106,8 +106,7 @@ control_cleanup(char *path)
 	if (path == NULL)
 		return;
 	event_del(&control_state.ev);
-	if (evtimer_pending(&control_state.evt, NULL))
-		event_del(&control_state.evt);
+	event_del(&control_state.evt);
 	unlink(path);
 }
 
diff --git a/usr.sbin/relayd/control.c b/usr.sbin/relayd/control.c
index 5cc6e60e04f..345bffe59a8 100644
--- a/usr.sbin/relayd/control.c
+++ b/usr.sbin/relayd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.41 2012/04/11 08:25:26 deraadt Exp $	*/
+/*	$OpenBSD: control.c,v 1.42 2012/04/11 08:33:53 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -129,8 +129,7 @@ control_cleanup(struct control_sock *cs)
 	if (cs->cs_name == NULL)
 		return;
 	event_del(&cs->cs_ev);
-	if (evtimer_pending(&cs->cs_evt, NULL))
-		event_del(&cs->cs_evt);
+	event_del(&cs->cs_evt);
 	(void)unlink(cs->cs_name);
 }
 
diff --git a/usr.sbin/ripd/control.c b/usr.sbin/ripd/control.c
index f3ea65d4ff1..2cc7bf596b3 100644
--- a/usr.sbin/ripd/control.c
+++ b/usr.sbin/ripd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.16 2012/04/10 07:56:54 deraadt Exp $ */
+/*	$OpenBSD: control.c,v 1.17 2012/04/11 08:33:53 deraadt Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -104,8 +104,7 @@ void
 control_cleanup(void)
 {
 	event_del(&control_state.ev);
-	if (evtimer_pending(&control_state.evt, NULL))
-		event_del(&control_state.evt);
+	event_del(&control_state.evt);
 	unlink(RIPD_SOCKET);
 }
 
diff --git a/usr.sbin/snmpd/control.c b/usr.sbin/snmpd/control.c
index 88cdc7c0076..5352e3a98eb 100644
--- a/usr.sbin/snmpd/control.c
+++ b/usr.sbin/snmpd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.14 2012/04/08 02:57:40 deraadt Exp $	*/
+/*	$OpenBSD: control.c,v 1.15 2012/04/11 08:33:53 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -127,8 +127,7 @@ control_cleanup(struct control_sock *cs)
 	if (cs->cs_name == NULL)
 		return;
 	event_del(&cs->cs_ev);
-	if (evtimer_pending(&cs->cs_evt, NULL))
-		event_del(&cs->cs_evt);
+	event_del(&cs->cs_evt);
 	(void)unlink(cs->cs_name);
 }