diff options
| author |   deraadt <deraadt@openbsd.org> | 2019-06-28 13:32:41 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2019-06-28 13:32:41 +0000 |
| commit | df69c215c7c66baf660f3f65414fd34796c96152 (patch) | |
| tree | 0255639162b24c4a2f761a274e32b69c2256fd45 /usr.sbin/map-mbone | |
| parent | miniroot prototype disklabels should attempt to contain accurate (diff) | |
| download | wireguard-openbsd-df69c215c7c66baf660f3f65414fd34796c96152.tar.xz wireguard-openbsd-df69c215c7c66baf660f3f65414fd34796c96152.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.sbin/map-mbone')
| -rw-r--r-- | usr.sbin/map-mbone/mapper.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/map-mbone/mapper.c b/usr.sbin/map-mbone/mapper.c index a1bcbab7cd0..925432b56df 100644 --- a/usr.sbin/map-mbone/mapper.c +++ b/usr.sbin/map-mbone/mapper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mapper.c,v 1.24 2016/08/03 23:13:54 krw Exp $ */ +/* $OpenBSD: mapper.c,v 1.25 2019/06/28 13:32:48 deraadt Exp $ */ /* $NetBSD: mapper.c,v 1.3 1995/12/10 11:12:04 mycroft Exp $ */ /* Mapper for connections between MRouteD multicast routers. @@ -876,9 +876,9 @@ int main(int argc, char *argv[]) addr.sin_len = sizeof addr; addr.sin_addr.s_addr = dvmrp_group; addr.sin_port = htons(2000); /* any port over 1024 will do... */ - if ((udp = socket(AF_INET, SOCK_DGRAM, 0)) < 0 - || connect(udp, (struct sockaddr *) &addr, sizeof(addr)) < 0 - || getsockname(udp, (struct sockaddr *) &addr, &addrlen) < 0) { + if ((udp = socket(AF_INET, SOCK_DGRAM, 0)) == -1 + || connect(udp, (struct sockaddr *) &addr, sizeof(addr)) == -1 + || getsockname(udp, (struct sockaddr *) &addr, &addrlen) == -1) { perror("Determining local address"); exit(1); } @@ -908,7 +908,7 @@ int main(int argc, char *argv[]) count = poll(pfd, 1, timeout * 1000); - if (count < 0) { + if (count == -1) { if (errno != EINTR) perror("select"); continue; |