diff options
| author |   jsg <jsg@openbsd.org> | 2015-09-05 09:47:08 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2015-09-05 09:47:08 +0000 |
| commit | d927f21f9c49cae2570fbd60317d0bf7ded5b7dc (patch) | |
| tree | 8094217350101d23feeb73f526a01abb9cb93023 /usr.bin/diff3 | |
| parent | Avoid unintended problems with operator precedence when doing an (diff) | |
| download | wireguard-openbsd-d927f21f9c49cae2570fbd60317d0bf7ded5b7dc.tar.xz wireguard-openbsd-d927f21f9c49cae2570fbd60317d0bf7ded5b7dc.zip | |
Add brackets to clarify assignments that are the result of a test operator.
ok deraadt@ looks correct millert@ jung@
Diffstat (limited to 'usr.bin/diff3')
| -rw-r--r-- | usr.bin/diff3/diff3prog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/diff3/diff3prog.c b/usr.bin/diff3/diff3prog.c index 94d5410dfe1..86d836e59d5 100644 --- a/usr.bin/diff3/diff3prog.c +++ b/usr.bin/diff3/diff3prog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3prog.c,v 1.14 2014/12/01 06:36:32 deraadt Exp $ */ +/* $OpenBSD: diff3prog.c,v 1.15 2015/09/05 09:47:08 jsg Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -298,7 +298,7 @@ merge(int m1, int m2) d1 = d13; d2 = d23; j = 0; - while ((t1 = d1 < d13 + m1) | (t2 = d2 < d23 + m2)) { + while ((t1 = (d1 < d13 + m1)) | (t2 = (d2 < d23 + m2))) { if (debug) { printf("%d,%d=%d,%d %d,%d=%d,%d\n", d1->old.from,d1->old.to, |