diff options
| author |   deraadt <deraadt@openbsd.org> | 2019-06-28 13:34:58 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2019-06-28 13:34:58 +0000 |
| commit | 3aaa63eb46949490a39db9c6d82aacc8ee5d8551 (patch) | |
| tree | ef48ea58ad350ab9d01fbfe32455a1df1fa2340c /usr.bin/cvs/diff_internals.c | |
| parent | fputc/fputs return EOF on error (diff) | |
| download | wireguard-openbsd-3aaa63eb46949490a39db9c6d82aacc8ee5d8551.tar.xz wireguard-openbsd-3aaa63eb46949490a39db9c6d82aacc8ee5d8551.zip | |
When system calls indicate an error they return -1, not some arbitrary
value < 0. errno is only updated in this case. Change all (most?)
callers of syscalls to follow this better, and let's see if this strictness
helps us in the future.
Diffstat (limited to 'usr.bin/cvs/diff_internals.c')
| -rw-r--r-- | usr.bin/cvs/diff_internals.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/cvs/diff_internals.c b/usr.bin/cvs/diff_internals.c index b75f128fe47..52eb215039a 100644 --- a/usr.bin/cvs/diff_internals.c +++ b/usr.bin/cvs/diff_internals.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff_internals.c,v 1.39 2016/10/15 22:20:17 millert Exp $ */ +/* $OpenBSD: diff_internals.c,v 1.40 2019/06/28 13:35:00 deraadt Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -329,7 +329,7 @@ diffreg(const char *file1, const char *file2, int _fd1, int _fd2, if (fd2 == -1) fatal("diffreg: dup: %s", strerror(errno)); - if (lseek(fd1, 0, SEEK_SET) < 0) + if (lseek(fd1, 0, SEEK_SET) == -1) fatal("diffreg: lseek: %s", strerror(errno)); f1 = fdopen(fd1, "r"); @@ -338,7 +338,7 @@ diffreg(const char *file1, const char *file2, int _fd1, int _fd2, goto closem; } - if (lseek(fd2, 0, SEEK_SET) < 0) + if (lseek(fd2, 0, SEEK_SET) == -1) fatal("diffreg: lseek: %s", strerror(errno)); f2 = fdopen(fd2, "r"); @@ -347,12 +347,12 @@ diffreg(const char *file1, const char *file2, int _fd1, int _fd2, goto closem; } - if (fstat(fd1, &stb1) < 0) { + if (fstat(fd1, &stb1) == -1) { cvs_log(LP_ERR, "%s", file1); goto closem; } - if (fstat(fd2, &stb2) < 0) { + if (fstat(fd2, &stb2) == -1) { cvs_log(LP_ERR, "%s", file2); goto closem; } @@ -867,7 +867,7 @@ preadline(int fd, size_t rlen, off_t off) ssize_t nr; line = xmalloc(rlen + 1); - if ((nr = pread(fd, line, rlen, off)) < 0) + if ((nr = pread(fd, line, rlen, off)) == -1) fatal("preadline: %s", strerror(errno)); line[nr] = '\0'; return (line); |