diff options
| author |   krw <krw@openbsd.org> | 2017-09-19 12:33:52 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2017-09-19 12:33:52 +0000 |
| commit | 5fc0cb1c2bc5591e2953517a29c7f17a62b4dcc3 (patch) | |
| tree | 799cd31cdd23969075fd30833d8452eedae73b01 /sbin/dhclient | |
| parent | Use explicit_bzero() instead of bzero() before free() to prevent (diff) | |
| download | wireguard-openbsd-5fc0cb1c2bc5591e2953517a29c7f17a62b4dcc3.tar.xz wireguard-openbsd-5fc0cb1c2bc5591e2953517a29c7f17a62b4dcc3.zip | |
flush_unpriv_ibuf() is now used only once so no
need to complicate things by passing it a string
identifying where it was called. Tweak log
verbiage.
Diffstat (limited to 'sbin/dhclient')
| -rw-r--r-- | sbin/dhclient/dispatch.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c index 263251cc42e..d33cec940a3 100644 --- a/sbin/dhclient/dispatch.c +++ b/sbin/dhclient/dispatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dispatch.c,v 1.142 2017/09/17 21:20:23 krw Exp $ */ +/* $OpenBSD: dispatch.c,v 1.143 2017/09/19 12:33:52 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -73,7 +73,7 @@ void packethandler(struct interface_info *ifi); -void flush_unpriv_ibuf(const char *); +void flush_unpriv_ibuf(void); /* * Loop waiting for packets, timeouts or routing messages. @@ -162,7 +162,7 @@ dispatch(struct interface_info *ifi, int routefd) if ((fds[1].revents & POLLIN) != 0) routehandler(ifi, routefd); if ((fds[2].revents & POLLOUT) != 0) - flush_unpriv_ibuf("dispatch"); + flush_unpriv_ibuf(); if ((fds[2].revents & POLLIN) != 0) quit = INTERNALSIG; } @@ -305,7 +305,7 @@ packethandler(struct interface_info *ifi) * flush_unpriv_ibuf stuffs queued messages into the imsg socket. */ void -flush_unpriv_ibuf(const char *who) +flush_unpriv_ibuf(void) { while (unpriv_ibuf->w.queued) { if (msgbuf_write(&unpriv_ibuf->w) <= 0) { @@ -314,8 +314,8 @@ flush_unpriv_ibuf(const char *who) if (quit == 0) quit = INTERNALSIG; if (errno != EPIPE && errno != 0) - log_warn("%s: %s: msgbuf_write", log_procname, - who); + log_warn("%s: msgbuf_write(unpriv_ibuf)", + log_procname); break; } } |