From 21bbe0c9dab80460c4b17c0ec48ba91dea34a953 Mon Sep 17 00:00:00 2001 From: Jacek Masiulaniec Date: Sun, 31 May 2009 20:30:16 +0000 Subject: Remove redundant imsg_event_add calls; ok claudio@ --- usr.sbin/ospf6d/control.c | 3 +-- usr.sbin/ospf6d/ospf6d.c | 4 +--- usr.sbin/ospf6d/ospfe.c | 4 +--- usr.sbin/ospf6d/rde.c | 4 +--- usr.sbin/ripd/control.c | 3 +-- usr.sbin/ripd/rde.c | 4 +--- usr.sbin/ripd/ripd.c | 4 +--- usr.sbin/ripd/ripe.c | 4 +--- 8 files changed, 8 insertions(+), 22 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/ospf6d/control.c b/usr.sbin/ospf6d/control.c index 778c6b7bb1e..3fd4a91ca52 100644 --- a/usr.sbin/ospf6d/control.c +++ b/usr.sbin/ospf6d/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.8 2009/05/31 17:00:40 claudio Exp $ */ +/* $OpenBSD: control.c,v 1.9 2009/05/31 20:29:56 jacekm Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -207,7 +207,6 @@ control_dispatch_imsg(int fd, short event, void *bula) control_close(fd); return; } - imsg_event_add(&c->ibuf); } for (;;) { diff --git a/usr.sbin/ospf6d/ospf6d.c b/usr.sbin/ospf6d/ospf6d.c index 870035d00b2..03221085b25 100644 --- a/usr.sbin/ospf6d/ospf6d.c +++ b/usr.sbin/ospf6d/ospf6d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospf6d.c,v 1.13 2009/05/31 17:00:40 claudio Exp $ */ +/* $OpenBSD: ospf6d.c,v 1.14 2009/05/31 20:29:56 jacekm Exp $ */ /* * Copyright (c) 2005 Claudio Jeker @@ -361,7 +361,6 @@ main_dispatch_ospfe(int fd, short event, void *bula) if (event & EV_WRITE) { if (msgbuf_write(&ibuf->w) == -1) fatal("msgbuf_write"); - imsg_event_add(ibuf); } for (;;) { @@ -428,7 +427,6 @@ main_dispatch_rde(int fd, short event, void *bula) if (event & EV_WRITE) { if (msgbuf_write(&ibuf->w) == -1) fatal("msgbuf_write"); - imsg_event_add(ibuf); } for (;;) { diff --git a/usr.sbin/ospf6d/ospfe.c b/usr.sbin/ospf6d/ospfe.c index 62f0e6122fc..20368a8c4ff 100644 --- a/usr.sbin/ospf6d/ospfe.c +++ b/usr.sbin/ospf6d/ospfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfe.c,v 1.26 2009/05/31 17:00:40 claudio Exp $ */ +/* $OpenBSD: ospfe.c,v 1.27 2009/05/31 20:29:56 jacekm Exp $ */ /* * Copyright (c) 2005 Claudio Jeker @@ -262,7 +262,6 @@ ospfe_dispatch_main(int fd, short event, void *bula) if (event & EV_WRITE) { if (msgbuf_write(&ibuf->w) == -1) fatal("msgbuf_write"); - imsg_event_add(ibuf); } for (;;) { @@ -396,7 +395,6 @@ ospfe_dispatch_rde(int fd, short event, void *bula) if (event & EV_WRITE) { if (msgbuf_write(&ibuf->w) == -1) fatal("msgbuf_write"); - imsg_event_add(ibuf); } for (;;) { diff --git a/usr.sbin/ospf6d/rde.c b/usr.sbin/ospf6d/rde.c index 20b27a5aaf1..5f110a2db0b 100644 --- a/usr.sbin/ospf6d/rde.c +++ b/usr.sbin/ospf6d/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.29 2009/05/31 17:00:40 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.30 2009/05/31 20:29:56 jacekm Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker @@ -264,7 +264,6 @@ rde_dispatch_imsg(int fd, short event, void *bula) if (event & EV_WRITE) { if (msgbuf_write(&ibuf->w) == -1) fatal("msgbuf_write"); - imsg_event_add(ibuf); } clock_gettime(CLOCK_MONOTONIC, &tp); @@ -633,7 +632,6 @@ rde_dispatch_parent(int fd, short event, void *bula) if (event & EV_WRITE) { if (msgbuf_write(&ibuf->w) == -1) fatal("msgbuf_write"); - imsg_event_add(ibuf); } for (;;) { diff --git a/usr.sbin/ripd/control.c b/usr.sbin/ripd/control.c index cc0878dd560..cd1ddd0e415 100644 --- a/usr.sbin/ripd/control.c +++ b/usr.sbin/ripd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.8 2009/05/31 17:06:01 claudio Exp $ */ +/* $OpenBSD: control.c,v 1.9 2009/05/31 20:30:15 jacekm Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -208,7 +208,6 @@ control_dispatch_imsg(int fd, short event, void *bula) control_close(fd); return; } - imsg_event_add(&c->ibuf); } for (;;) { diff --git a/usr.sbin/ripd/rde.c b/usr.sbin/ripd/rde.c index 6322dac1a4b..f00e135e3f4 100644 --- a/usr.sbin/ripd/rde.c +++ b/usr.sbin/ripd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.10 2009/05/31 17:06:01 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.11 2009/05/31 20:30:15 jacekm Exp $ */ /* * Copyright (c) 2006 Michele Marchetto @@ -196,7 +196,6 @@ rde_dispatch_imsg(int fd, short event, void *bula) if (event & EV_WRITE) { if (msgbuf_write(&ibuf->w) == -1) fatal("msgbuf_write"); - imsg_event_add(ibuf); } for (;;) { @@ -291,7 +290,6 @@ rde_dispatch_parent(int fd, short event, void *bula) if (event & EV_WRITE) { if (msgbuf_write(&ibuf->w) == -1) fatal("msgbuf_write"); - imsg_event_add(ibuf); } for (;;) { diff --git a/usr.sbin/ripd/ripd.c b/usr.sbin/ripd/ripd.c index 5dffa43989d..57167cce94d 100644 --- a/usr.sbin/ripd/ripd.c +++ b/usr.sbin/ripd/ripd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ripd.c,v 1.14 2009/05/31 17:06:01 claudio Exp $ */ +/* $OpenBSD: ripd.c,v 1.15 2009/05/31 20:30:15 jacekm Exp $ */ /* * Copyright (c) 2006 Michele Marchetto @@ -349,7 +349,6 @@ main_dispatch_ripe(int fd, short event, void *bula) if (event & EV_WRITE) { if (msgbuf_write(&ibuf->w) == -1) fatal("msgbuf_write"); - imsg_event_add(ibuf); } for (;;) { @@ -421,7 +420,6 @@ main_dispatch_rde(int fd, short event, void *bula) if (event & EV_WRITE) { if (msgbuf_write(&ibuf->w) == -1) fatal("msgbuf_write"); - imsg_event_add(ibuf); } for (;;) { diff --git a/usr.sbin/ripd/ripe.c b/usr.sbin/ripd/ripe.c index 6b1d23f27ee..1094c50cc97 100644 --- a/usr.sbin/ripd/ripe.c +++ b/usr.sbin/ripd/ripe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ripe.c,v 1.10 2009/05/31 17:06:01 claudio Exp $ */ +/* $OpenBSD: ripe.c,v 1.11 2009/05/31 20:30:15 jacekm Exp $ */ /* * Copyright (c) 2006 Michele Marchetto @@ -238,7 +238,6 @@ ripe_dispatch_main(int fd, short event, void *bula) if (event & EV_WRITE) { if (msgbuf_write(&ibuf->w) == -1) fatal("msgbuf_write"); - imsg_event_add(ibuf); } for (;;) { @@ -318,7 +317,6 @@ ripe_dispatch_rde(int fd, short event, void *bula) if (event & EV_WRITE) { if (msgbuf_write(&ibuf->w) == -1) fatal("msgbuf_write"); - imsg_event_add(ibuf); } for (;;) { -- cgit v1.2.3