diff options
author | markm <markm@FreeBSD.org> | 2002-02-22 20:51:00 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2002-02-22 20:51:00 +0000 |
commit | 7b7558d88436331476243b0b668d2e257d7687fe (patch) | |
tree | ba3cea9a04974b56b589e2a934d2f4ae56780dce /bin/date/netdate.c | |
parent | f24931e332589b25b779130a37d5f3491e609025 (diff) | |
download | FreeBSD-src-7b7558d88436331476243b0b668d2e257d7687fe.zip FreeBSD-src-7b7558d88436331476243b0b668d2e257d7687fe.tar.gz |
Fix warnings inspired by lint, a commercial lint and WARNS=4.
Diffstat (limited to 'bin/date/netdate.c')
-rw-r--r-- | bin/date/netdate.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/bin/date/netdate.c b/bin/date/netdate.c index c8bb51a..f9866fd 100644 --- a/bin/date/netdate.c +++ b/bin/date/netdate.c @@ -73,10 +73,10 @@ netsettime(time_t tval) struct timeval tout; struct servent *sp; struct tsp msg; - struct sockaddr_in sin, dest, from; + struct sockaddr_in lsin, dest, from; fd_set ready; long waittime; - int s, length, port, timed_ack, found, err; + int s, length, port, timed_ack, found, lerr; char hostname[MAXHOSTNAMELEN]; if ((sp = getservbyname("timed", "udp")) == NULL) { @@ -94,11 +94,11 @@ netsettime(time_t tval) return (retval = 2); } - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; + memset(&lsin, 0, sizeof(lsin)); + lsin.sin_family = AF_INET; for (port = IPPORT_RESERVED - 1; port > IPPORT_RESERVED / 2; port--) { - sin.sin_port = htons((u_short)port); - if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0) + lsin.sin_port = htons((u_short)port); + if (bind(s, (struct sockaddr *)&lsin, sizeof(lsin)) >= 0) break; if (errno == EADDRINUSE) continue; @@ -142,11 +142,11 @@ loop: FD_SET(s, &ready); found = select(FD_SETSIZE, &ready, (fd_set *)0, (fd_set *)0, &tout); - length = sizeof(err); + length = sizeof(lerr); if (!getsockopt(s, - SOL_SOCKET, SO_ERROR, (char *)&err, &length) && err) { - if (err != ECONNREFUSED) - warnc(err, "send (delayed error)"); + SOL_SOCKET, SO_ERROR, (char *)&lerr, &length) && lerr) { + if (lerr != ECONNREFUSED) + warnc(lerr, "send (delayed error)"); goto bad; } |