diff options
| author |   pyr <pyr@openbsd.org> | 2009-06-06 05:04:12 +0000 |
|---|---|---|
| committer | pyr <pyr@openbsd.org> | 2009-06-06 05:04:12 +0000 |
| commit | c19ab57838a08bc3fbcdf518cec6f8d6fd1efac6 (patch) | |
| tree | 8a3ea39f95f3e0c3203fe0f4c6c451979f86684c | |
| parent | Sync with relayd: (diff) | |
| download | wireguard-openbsd-c19ab57838a08bc3fbcdf518cec6f8d6fd1efac6.tar.xz wireguard-openbsd-c19ab57838a08bc3fbcdf518cec6f8d6fd1efac6.zip | |
remove unnecessary and scary pid check in imsg_init.
ok eric@, claudio@
| -rw-r--r-- | usr.sbin/ospfd/imsg.c | 14 | ||||
| -rw-r--r-- | usr.sbin/relayd/imsg.c | 12 | ||||
| -rw-r--r-- | usr.sbin/smtpd/imsg.c | 12 | ||||
| -rw-r--r-- | usr.sbin/ypldap/imsg.c | 12 |
4 files changed, 21 insertions, 29 deletions
diff --git a/usr.sbin/ospfd/imsg.c b/usr.sbin/ospfd/imsg.c index 67f77a6c002..3baf6a8c3bb 100644 --- a/usr.sbin/ospfd/imsg.c +++ b/usr.sbin/ospfd/imsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.12 2009/06/05 19:33:58 pyr Exp $ */ +/* $OpenBSD: imsg.c,v 1.13 2009/06/06 05:04:12 pyr Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -31,13 +31,11 @@ void imsg_init(struct imsgbuf *ibuf, int fd, void (*handler)(int, short, void *)) { - if (!ibuf->pid) { - msgbuf_init(&ibuf->w); - bzero(&ibuf->r, sizeof(ibuf->r)); - ibuf->pid = getpid(); - ibuf->handler = handler; - TAILQ_INIT(&ibuf->fds); - } + msgbuf_init(&ibuf->w); + bzero(&ibuf->r, sizeof(ibuf->r)); + ibuf->pid = getpid(); + ibuf->handler = handler; + TAILQ_INIT(&ibuf->fds); ibuf->fd = fd; ibuf->w.fd = fd; } diff --git a/usr.sbin/relayd/imsg.c b/usr.sbin/relayd/imsg.c index b91d123e266..03927497313 100644 --- a/usr.sbin/relayd/imsg.c +++ b/usr.sbin/relayd/imsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.23 2009/06/05 23:39:51 pyr Exp $ */ +/* $OpenBSD: imsg.c,v 1.24 2009/06/06 05:04:12 pyr Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -31,14 +31,12 @@ void imsg_init(struct imsgbuf *ibuf, int fd) { - if (!ibuf->pid) { - msgbuf_init(&ibuf->w); - bzero(&ibuf->r, sizeof(ibuf->r)); - ibuf->pid = getpid(); - TAILQ_INIT(&ibuf->fds); - } + msgbuf_init(&ibuf->w); + bzero(&ibuf->r, sizeof(ibuf->r)); ibuf->fd = fd; ibuf->w.fd = fd; + ibuf->pid = getpid(); + TAILQ_INIT(&ibuf->fds); } ssize_t diff --git a/usr.sbin/smtpd/imsg.c b/usr.sbin/smtpd/imsg.c index ffedd039cf2..5230b2abd7d 100644 --- a/usr.sbin/smtpd/imsg.c +++ b/usr.sbin/smtpd/imsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.4 2009/06/06 04:14:21 pyr Exp $ */ +/* $OpenBSD: imsg.c,v 1.5 2009/06/06 05:04:12 pyr Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -31,12 +31,10 @@ void imsg_init(struct imsgbuf *ibuf, int fd) { - if (!ibuf->pid) { - msgbuf_init(&ibuf->w); - bzero(&ibuf->r, sizeof(ibuf->r)); - ibuf->pid = getpid(); - TAILQ_INIT(&ibuf->fds); - } + msgbuf_init(&ibuf->w); + bzero(&ibuf->r, sizeof(ibuf->r)); + ibuf->pid = getpid(); + TAILQ_INIT(&ibuf->fds); ibuf->fd = fd; ibuf->w.fd = fd; } diff --git a/usr.sbin/ypldap/imsg.c b/usr.sbin/ypldap/imsg.c index 36fb21e82c5..d176c9479ef 100644 --- a/usr.sbin/ypldap/imsg.c +++ b/usr.sbin/ypldap/imsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.2 2009/06/06 05:02:58 eric Exp $ */ +/* $OpenBSD: imsg.c,v 1.3 2009/06/06 05:04:12 pyr Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -31,12 +31,10 @@ void imsg_init(struct imsgbuf *ibuf, int fd) { - if (!ibuf->pid) { - msgbuf_init(&ibuf->w); - bzero(&ibuf->r, sizeof(ibuf->r)); - ibuf->pid = getpid(); - TAILQ_INIT(&ibuf->fds); - } + msgbuf_init(&ibuf->w); + bzero(&ibuf->r, sizeof(ibuf->r)); + ibuf->pid = getpid(); + TAILQ_INIT(&ibuf->fds); ibuf->fd = fd; ibuf->w.fd = fd; } |