summaryrefslogtreecommitdiffstats
path: root/usr.bin/diff3
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2016-10-16 13:03:40 +0000
committermillert <millert@openbsd.org>2016-10-16 13:03:40 +0000
commitbd1f19946165c11b292eb6916f7c95ca4bd8758d (patch)
tree3b95630438daf79f54160c383d78f45f84b910ef /usr.bin/diff3
parentZap unused variable. (diff)
downloadwireguard-openbsd-bd1f19946165c11b292eb6916f7c95ca4bd8758d.tar.xz
wireguard-openbsd-bd1f19946165c11b292eb6916f7c95ca4bd8758d.zip
Remove useless n=n assignment in the first parse of a for().
It was already removed from the rcs version by nicm@.
Diffstat (limited to 'usr.bin/diff3')
-rw-r--r--usr.bin/diff3/diff3prog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/diff3/diff3prog.c b/usr.bin/diff3/diff3prog.c
index b928b062167..512fef48380 100644
--- a/usr.bin/diff3/diff3prog.c
+++ b/usr.bin/diff3/diff3prog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff3prog.c,v 1.17 2015/10/09 01:37:07 deraadt Exp $ */
+/* $OpenBSD: diff3prog.c,v 1.18 2016/10/16 13:03:40 millert Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
@@ -543,7 +543,7 @@ edscript(int n)
int j,k;
char block[BUFSIZ];
- for (n = n; n > 0; n--) {
+ for (; n > 0; n--) {
if (!oflag || !overlap[n])
prange(&de[n].old);
else