===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/uploader.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- src/usr.bin/rsync/uploader.c	2019/02/18 22:47:34	1.17
+++ src/usr.bin/rsync/uploader.c	2019/03/18 15:33:21	1.18
@@ -1,4 +1,4 @@
-/*	$Id: uploader.c,v 1.17 2019/02/18 22:47:34 benno Exp $ */
+/*	$Id: uploader.c,v 1.18 2019/03/18 15:33:21 deraadt Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Florian Obser <florian@openbsd.org>
@@ -72,7 +72,7 @@
 		return;
 	sz = strlen(f->path);
 	assert(sz > 0);
-	LOG1(sess, "%s%s", f->path, ('/' == f->path[sz - 1]) ? "" : "/");
+	LOG1(sess, "%s%s", f->path, (f->path[sz - 1] == '/') ? "" : "/");
 }
 
 /*
@@ -463,7 +463,7 @@
 	 * mark it from replacement.
 	 */
 
-	assert(-1 != p->rootfd);
+	assert(p->rootfd != -1);
 	rc = fstatat(p->rootfd, f->path, &st, AT_SYMLINK_NOFOLLOW);
 
 	if (rc != -1 && !S_ISSOCK(st.st_mode)) {