From: krw <krw@openbsd.org>
Date: Sun, 13 Jul 2014 16:43:25 +0000 (+0000)
Subject: When the three possible return values are -1, 0, and 1, != 1 is the same
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=25811214cefe61a0ae8996608f78de426d3e4170;p=openbsd

When the three possible return values are -1, 0, and 1, != 1 is the same
as <= 0. And the latter is the normal idiom so use that.

ok claudio@ henning@
---

diff --git a/usr.sbin/ldapd/imsgev.c b/usr.sbin/ldapd/imsgev.c
index 36e9fcbf3aa..6daa4d1d397 100644
--- a/usr.sbin/ldapd/imsgev.c
+++ b/usr.sbin/ldapd/imsgev.c
@@ -138,7 +138,7 @@ imsgev_dispatch(int fd, short ev, void *humppa)
 		 * closed, or some error occured. Both case are not recoverable
 		 * from the imsg perspective, so we treat it as a WRITE error.
 		 */
-		if ((n = msgbuf_write(&ibuf->w)) != 1 && errno != EAGAIN) {
+		if ((n = msgbuf_write(&ibuf->w)) <= 0 && errno != EAGAIN) {
 			imsgev_disconnect(iev, IMSGEV_EWRITE);
 			return;
 		}