When the three possible return values are -1, 0, and 1, != 1 is the same
authorkrw <krw@openbsd.org>
Sun, 13 Jul 2014 16:43:25 +0000 (16:43 +0000)
committerkrw <krw@openbsd.org>
Sun, 13 Jul 2014 16:43:25 +0000 (16:43 +0000)
as <= 0. And the latter is the normal idiom so use that.

ok claudio@ henning@

usr.sbin/ldapd/imsgev.c

index 36e9fcb..6daa4d1 100644 (file)
@@ -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;
                }