===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/io.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/usr.bin/rsync/io.c	2019/02/10 23:24:14	1.2
+++ src/usr.bin/rsync/io.c	2019/02/11 19:18:36	1.3
@@ -1,4 +1,4 @@
-/*	$Id: io.c,v 1.2 2019/02/10 23:24:14 benno Exp $ */
+/*	$Id: io.c,v 1.3 2019/02/11 19:18:36 deraadt Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -72,7 +72,7 @@
 	} else if ((pfd.revents & POLLHUP)) {
 		ERRX(sess, "poll: hangup");
 		return 0;
-	} else if ( ! (pfd.revents & POLLOUT)) {
+	} else if (!(pfd.revents & POLLOUT)) {
 		ERRX(sess, "poll: unknown event");
 		return 0;
 	}
@@ -99,7 +99,7 @@
 
 	while (sz > 0) {
 		c = io_write_nonblocking(sess, fd, buf, sz, &wsz);
-		if ( ! c) {
+		if (!c) {
 			ERRX1(sess, "io_write_nonblocking");
 			return 0;
 		} else if (0 == wsz) {
@@ -125,7 +125,7 @@
 	size_t	 wsz;
 	int	 c;
 
-	if ( ! sess->mplex_writes) {
+	if (!sess->mplex_writes) {
 		c = io_write_blocking(sess, fd, buf, sz);
 		sess->total_write += sz;
 		return c;
@@ -135,11 +135,11 @@
 		wsz = sz & 0xFFFFFF;
 		tag = (7 << 24) + wsz;
 		tagbuf = htole32(tag);
-		if ( ! io_write_blocking(sess, fd, &tagbuf, sizeof(tagbuf))) {
+		if (!io_write_blocking(sess, fd, &tagbuf, sizeof(tagbuf))) {
 			ERRX1(sess, "io_write_blocking");
 			return 0;
 		}
-		if ( ! io_write_blocking(sess, fd, buf, wsz)) {
+		if (!io_write_blocking(sess, fd, buf, wsz)) {
 			ERRX1(sess, "io_write_blocking");
 			return 0;
 		}
@@ -159,9 +159,9 @@
 io_write_line(struct sess *sess, int fd, const char *line)
 {
 
-	if ( ! io_write_buf(sess, fd, line, strlen(line)))
+	if (!io_write_buf(sess, fd, line, strlen(line)))
 		ERRX1(sess, "io_write_buf");
-	else if ( ! io_write_byte(sess, fd, '\n'))
+	else if (!io_write_byte(sess, fd, '\n'))
 		ERRX1(sess, "io_write_byte");
 	else
 		return 1;
@@ -195,7 +195,7 @@
 	if ((pfd.revents & (POLLERR|POLLNVAL))) {
 		ERRX(sess, "poll: bad fd");
 		return 0;
-	} else if ( ! (pfd.revents & (POLLIN|POLLHUP))) {
+	} else if (!(pfd.revents & (POLLIN|POLLHUP))) {
 		ERRX(sess, "poll: unknown event");
 		return 0;
 	}
@@ -227,7 +227,7 @@
 
 	while (sz > 0) {
 		c = io_read_nonblocking(sess, fd, buf, sz, &rsz);
-		if ( ! c) {
+		if (!c) {
 			ERRX1(sess, "io_read_nonblocking");
 			return 0;
 		} else if (0 == rsz) {
@@ -268,7 +268,7 @@
 	 * for the remaining data size.
 	 */
 
-	if ( ! io_read_blocking(sess, fd, &tagbuf, sizeof(tagbuf))) {
+	if (!io_read_blocking(sess, fd, &tagbuf, sizeof(tagbuf))) {
 		ERRX1(sess, "io_read_blocking");
 		return 0;
 	}
@@ -286,7 +286,7 @@
 	} else if (0 == sess->mplex_read_remain)
 		return 1;
 
-	if ( ! io_read_blocking(sess, fd,
+	if (!io_read_blocking(sess, fd,
 	    mpbuf, sess->mplex_read_remain)) {
 		ERRX1(sess, "io_read_blocking");
 		return 0;
@@ -328,7 +328,7 @@
 
 	/* If we're not multiplexing, read directly. */
 
-	if ( ! sess->mplex_reads) {
+	if (!sess->mplex_reads) {
 		assert(0 == sess->mplex_read_remain);
 		c = io_read_blocking(sess, fd, buf, sz);
 		sess->total_read += sz;
@@ -346,7 +346,7 @@
 		if (sess->mplex_read_remain) {
 			rsz = sess->mplex_read_remain < sz ?
 				sess->mplex_read_remain : sz;
-			if ( ! io_read_blocking(sess, fd, buf, rsz)) {
+			if (!io_read_blocking(sess, fd, buf, rsz)) {
 				ERRX1(sess, "io_read_blocking");
 				return 0;
 			}
@@ -358,7 +358,7 @@
 		}
 
 		assert(0 == sess->mplex_read_remain);
-		if ( ! io_read_flush(sess, fd)) {
+		if (!io_read_flush(sess, fd)) {
 			ERRX1(sess, "io_read_flush");
 			return 0;
 		}
@@ -381,9 +381,9 @@
 
 	nv = htole64(val);
 
-	if ( ! io_write_int(sess, fd, INT32_MAX))
+	if (!io_write_int(sess, fd, INT32_MAX))
 		ERRX(sess, "io_write_int");
-	else if ( ! io_write_buf(sess, fd, &nv, sizeof(int64_t)))
+	else if (!io_write_buf(sess, fd, &nv, sizeof(int64_t)))
 		ERRX(sess, "io_write_buf");
 	else
 		return 1;
@@ -398,7 +398,7 @@
 
 	nv = htole32(val);
 
-	if ( ! io_write_buf(sess, fd, &nv, sizeof(int32_t))) {
+	if (!io_write_buf(sess, fd, &nv, sizeof(int32_t))) {
 		ERRX(sess, "io_write_buf");
 		return 0;
 	}
@@ -440,7 +440,7 @@
 {
 	int64_t	oval;
 
-	if ( ! io_read_long(sess, fd, &oval)) {
+	if (!io_read_long(sess, fd, &oval)) {
 		ERRX(sess, "io_read_int");
 		return 0;
 	} else if (oval < 0) {
@@ -460,7 +460,7 @@
 
 	/* Start with the short-circuit: read as an int. */
 
-	if ( ! io_read_int(sess, fd, &sval)) {
+	if (!io_read_int(sess, fd, &sval)) {
 		ERRX(sess, "io_read_int");
 		return 0;
 	} else if (INT32_MAX != sval) {
@@ -470,7 +470,7 @@
 
 	/* If the int is maximal, read as 64 bits. */
 
-	if ( ! io_read_buf(sess, fd, &oval, sizeof(int64_t))) {
+	if (!io_read_buf(sess, fd, &oval, sizeof(int64_t))) {
 		ERRX(sess, "io_read_buf");
 		return 0;
 	}
@@ -490,7 +490,7 @@
 {
 	int32_t	oval;
 
-	if ( ! io_read_int(sess, fd, &oval)) {
+	if (!io_read_int(sess, fd, &oval)) {
 		ERRX(sess, "io_read_int");
 		return 0;
 	} else if (oval < 0) {
@@ -507,7 +507,7 @@
 {
 	int32_t	oval;
 
-	if ( ! io_read_buf(sess, fd, &oval, sizeof(int32_t))) {
+	if (!io_read_buf(sess, fd, &oval, sizeof(int32_t))) {
 		ERRX(sess, "io_read_buf");
 		return 0;
 	}
@@ -565,7 +565,7 @@
 io_read_byte(struct sess *sess, int fd, uint8_t *val)
 {
 
-	if ( ! io_read_buf(sess, fd, val, sizeof(uint8_t))) {
+	if (!io_read_buf(sess, fd, val, sizeof(uint8_t))) {
 		ERRX(sess, "io_read_buf");
 		return 0;
 	}
@@ -576,7 +576,7 @@
 io_write_byte(struct sess *sess, int fd, uint8_t val)
 {
 
-	if ( ! io_write_buf(sess, fd, &val, sizeof(uint8_t))) {
+	if (!io_write_buf(sess, fd, &val, sizeof(uint8_t))) {
 		ERRX(sess, "io_write_buf");
 		return 0;
 	}