diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-04-29 19:56:05 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-04-29 19:56:05 +0000 |
| commit | 192c29c129918b8523baca5a5b5f0d4d78497439 (patch) | |
| tree | 2f6665c7ed86ef609f9d51464674039bde2907ec /usr.sbin/bgpd/imsg.c | |
| parent | c427f27d9c495f2eb86e1695f38f557dafb054b2 (diff) | |
sock -> fd; ok henning
Diffstat (limited to 'usr.sbin/bgpd/imsg.c')
| -rw-r--r-- | usr.sbin/bgpd/imsg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/bgpd/imsg.c b/usr.sbin/bgpd/imsg.c index e461970ee07..eb81ad58b7b 100644 --- a/usr.sbin/bgpd/imsg.c +++ b/usr.sbin/bgpd/imsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.24 2004/03/12 20:48:09 henning Exp $ */ +/* $OpenBSD: imsg.c,v 1.25 2004/04/29 19:56:04 deraadt Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -31,12 +31,12 @@ struct buf *imsg_create_core(struct imsgbuf *, int, u_int32_t, u_int16_t, pid_t); void -imsg_init(struct imsgbuf *ibuf, int sock) +imsg_init(struct imsgbuf *ibuf, int fd) { msgbuf_init(&ibuf->w); bzero(&ibuf->r, sizeof(ibuf->r)); - ibuf->sock = sock; - ibuf->w.sock = sock; + ibuf->fd = fd; + ibuf->w.fd = fd; ibuf->pid = getpid(); } @@ -45,7 +45,7 @@ imsg_read(struct imsgbuf *ibuf) { ssize_t n; - if ((n = read(ibuf->sock, ibuf->r.buf + ibuf->r.wpos, + if ((n = read(ibuf->fd, ibuf->r.buf + ibuf->r.wpos, sizeof(ibuf->r.buf) - ibuf->r.wpos)) == -1) { if (errno != EINTR && errno != EAGAIN) { log_warn("imsg_read: pipe read error"); |