diff options
| author |   avsm <avsm@openbsd.org> | 2003-10-24 20:30:02 +0000 |
|---|---|---|
| committer | avsm <avsm@openbsd.org> | 2003-10-24 20:30:02 +0000 |
| commit | ca9f5f35f7c44d7bcfeab03a1aac9e519c331264 (patch) | |
| tree | 72c90f49bf82436481c29b059ea7212cfec37866 /usr.bin/diff3/diff3prog.c | |
| parent | If cons_backlight_available is not set, cons_brightness will not be valid, (diff) | |
| download | wireguard-openbsd-ca9f5f35f7c44d7bcfeab03a1aac9e519c331264.tar.xz wireguard-openbsd-ca9f5f35f7c44d7bcfeab03a1aac9e519c331264.zip | |
dont compare int to NULL, millert@ ok
Diffstat (limited to 'usr.bin/diff3/diff3prog.c')
| -rw-r--r-- | usr.bin/diff3/diff3prog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/diff3/diff3prog.c b/usr.bin/diff3/diff3prog.c index 2b8a57516aa..c1abdc5d5f9 100644 --- a/usr.bin/diff3/diff3prog.c +++ b/usr.bin/diff3/diff3prog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3prog.c,v 1.2 2003/07/14 17:43:52 deraadt Exp $ */ +/* $OpenBSD: diff3prog.c,v 1.3 2003/10/24 20:32:06 avsm Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -71,7 +71,7 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -static const char rcsid[] = "$OpenBSD: diff3prog.c,v 1.2 2003/07/14 17:43:52 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: diff3prog.c,v 1.3 2003/10/24 20:32:06 avsm Exp $"; #endif /* not lint */ #include <stdio.h> @@ -450,7 +450,7 @@ skip(int i, int from, char *pr) int j, n; for (n = 0; cline[i] < from - 1; n += j) { - if ((j = getline(fp[i])) == NULL) + if ((j = getline(fp[i])) == 0) trouble(); if (pr != NULL) printf("%s%s", pr, line); |