diff options
| -rw-r--r-- | usr.bin/cvs/diff3.c | 4 | ||||
| -rw-r--r-- | usr.bin/diff3/diff3prog.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c index 9c1d202812a..ae5f1fd05c3 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.60 2016/10/15 22:20:17 millert Exp $ */ +/* $OpenBSD: diff3.c,v 1.61 2016/10/16 13:03:40 millert Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -786,7 +786,7 @@ edscript(int n) int j, k; char block[BUFSIZ+1]; - for (n = n; n > 0; n--) { + for (; n > 0; n--) { if (!oflag || !overlap[n]) prange(&de[n].old); else 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 |