diff options
author | deraadt <> | 2002-09-06 18:35:12 +0000 |
---|---|---|
committer | deraadt <> | 2002-09-06 18:35:12 +0000 |
commit | 103759ac88a6c48f6280dfdd527d3465b4d686f7 (patch) | |
tree | 8b884469332b76c241f4eedb742debb0497503eb | |
parent | 154dc21ed42de3fb550aa3c54823498ea9aa644a (diff) | |
download | openbsd-103759ac88a6c48f6280dfdd527d3465b4d686f7.tar.gz openbsd-103759ac88a6c48f6280dfdd527d3465b4d686f7.tar.bz2 openbsd-103759ac88a6c48f6280dfdd527d3465b4d686f7.zip |
use socklen_t where needed; henning pvalchev ok
-rw-r--r-- | src/lib/libc/net/rcmd.c | 4 | ||||
-rw-r--r-- | src/lib/libc/net/res_send.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libc/net/rcmd.c b/src/lib/libc/net/rcmd.c index be68c599d8..d3d2d751b5 100644 --- a/src/lib/libc/net/rcmd.c +++ b/src/lib/libc/net/rcmd.c | |||
@@ -34,7 +34,7 @@ | |||
34 | */ | 34 | */ |
35 | 35 | ||
36 | #if defined(LIBC_SCCS) && !defined(lint) | 36 | #if defined(LIBC_SCCS) && !defined(lint) |
37 | static char *rcsid = "$OpenBSD: rcmd.c,v 1.43 2002/05/24 21:22:37 deraadt Exp $"; | 37 | static char *rcsid = "$OpenBSD: rcmd.c,v 1.44 2002/09/06 18:35:12 deraadt Exp $"; |
38 | #endif /* LIBC_SCCS and not lint */ | 38 | #endif /* LIBC_SCCS and not lint */ |
39 | 39 | ||
40 | #include <sys/param.h> | 40 | #include <sys/param.h> |
@@ -216,7 +216,7 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) | |||
216 | } else { | 216 | } else { |
217 | char num[8]; | 217 | char num[8]; |
218 | int s2 = rresvport_af(&lport, af), s3; | 218 | int s2 = rresvport_af(&lport, af), s3; |
219 | int len = sizeof(from); | 219 | socklen_t len = sizeof(from); |
220 | int fdssize = howmany(MAX(s, s2)+1, NFDBITS) * sizeof(fd_mask); | 220 | int fdssize = howmany(MAX(s, s2)+1, NFDBITS) * sizeof(fd_mask); |
221 | 221 | ||
222 | if (s2 < 0) | 222 | if (s2 < 0) |
diff --git a/src/lib/libc/net/res_send.c b/src/lib/libc/net/res_send.c index 81bf23ba9f..b043e7c9fb 100644 --- a/src/lib/libc/net/res_send.c +++ b/src/lib/libc/net/res_send.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: res_send.c,v 1.11 2002/02/16 21:27:23 millert Exp $ */ | 1 | /* $OpenBSD: res_send.c,v 1.12 2002/09/06 18:35:12 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * ++Copyright++ 1985, 1989, 1993 | 4 | * ++Copyright++ 1985, 1989, 1993 |
@@ -64,7 +64,7 @@ | |||
64 | static char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93"; | 64 | static char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93"; |
65 | static char rcsid[] = "$From: res_send.c,v 8.12 1996/10/08 04:51:06 vixie Exp $"; | 65 | static char rcsid[] = "$From: res_send.c,v 8.12 1996/10/08 04:51:06 vixie Exp $"; |
66 | #else | 66 | #else |
67 | static char rcsid[] = "$OpenBSD: res_send.c,v 1.11 2002/02/16 21:27:23 millert Exp $"; | 67 | static char rcsid[] = "$OpenBSD: res_send.c,v 1.12 2002/09/06 18:35:12 deraadt Exp $"; |
68 | #endif | 68 | #endif |
69 | #endif /* LIBC_SCCS and not lint */ | 69 | #endif /* LIBC_SCCS and not lint */ |
70 | 70 | ||
@@ -579,7 +579,7 @@ read_len: | |||
579 | struct timeval timeout; | 579 | struct timeval timeout; |
580 | fd_set *dsmaskp; | 580 | fd_set *dsmaskp; |
581 | struct sockaddr_storage from; | 581 | struct sockaddr_storage from; |
582 | int fromlen; | 582 | socklen_t fromlen; |
583 | 583 | ||
584 | if ((s < 0) || vc || (af != nsap->sa_family)) { | 584 | if ((s < 0) || vc || (af != nsap->sa_family)) { |
585 | if (vc) | 585 | if (vc) |