diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2024-11-21 13:17:04 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2024-11-21 13:17:04 +0000 |
| commit | caba869c8447fc7ef9f32581e1d02262e51ec18a (patch) | |
| tree | c06988b36b6677e805071a9673b04b5360e2e36d /sbin/dhcp6leased/control.c | |
| parent | 9c8d00dd06d79ba9fccf07c45cd1bdae73e744c5 (diff) | |
Rename imsg_init, imsg_clear, imsg_read, imsg_write and imsg_flush to
imsgbuf_init, imsgbuf_clear, imsgbuf_read, imsgbuf_write and imsgbuf_flush.
This separates the imsgbuf API from the per-imsg API.
OK tb@
Diffstat (limited to 'sbin/dhcp6leased/control.c')
| -rw-r--r-- | sbin/dhcp6leased/control.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sbin/dhcp6leased/control.c b/sbin/dhcp6leased/control.c index 20dbd9118ba..12c149a5a01 100644 --- a/sbin/dhcp6leased/control.c +++ b/sbin/dhcp6leased/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.5 2024/11/21 13:14:44 claudio Exp $ */ +/* $OpenBSD: control.c,v 1.6 2024/11/21 13:17:01 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -156,7 +156,7 @@ control_accept(int listenfd, short event, void *bula) return; } - imsg_init(&c->iev.ibuf, connfd); + imsgbuf_init(&c->iev.ibuf, connfd); c->iev.handler = control_dispatch_imsg; c->iev.events = EV_READ; event_set(&c->iev.ev, c->iev.ibuf.fd, c->iev.events, @@ -231,14 +231,14 @@ control_dispatch_imsg(int fd, short event, void *bula) } if (event & EV_READ) { - if (((n = imsg_read(&c->iev.ibuf)) == -1 && errno != EAGAIN) || - n == 0) { + if (((n = imsgbuf_read(&c->iev.ibuf)) == -1 && + errno != EAGAIN) || n == 0) { control_close(fd); return; } } if (event & EV_WRITE) { - if (imsg_write(&c->iev.ibuf) == -1) { + if (imsgbuf_write(&c->iev.ibuf) == -1) { control_close(fd); return; } |