diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2006-06-19 01:54:33 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-06-19 01:54:33 +0000 |
| commit | 9cd0e9a2eea56e8dd29905850d0276aedb0c67a8 (patch) | |
| tree | 58e58c5b3c4428dcbf94273e433df23ceb517f5e | |
| parent | c0997b097e87967245dfa6d5508197dcb597920e (diff) | |
sync fix fixes from glibc
| -rw-r--r-- | libc/inet/rpc/rtime.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libc/inet/rpc/rtime.c b/libc/inet/rpc/rtime.c index fc4cfe548..d306d4ce8 100644 --- a/libc/inet/rpc/rtime.c +++ b/libc/inet/rpc/rtime.c @@ -1,3 +1,6 @@ +#if 0 +static char sccsid[] = "@(#)rtime.c 2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 SMI"; +#endif /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape @@ -26,9 +29,6 @@ * 2550 Garcia Avenue * Mountain View, California 94043 */ -#if 0 -static char sccsid[] = "@(#)rtime.c 2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 SMI"; -#endif /* * Copyright (c) 1988 by Sun Microsystems, Inc. @@ -89,9 +89,10 @@ rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep, struct pollfd fd; int milliseconds; int res; - unsigned long thetime; + /* RFC 868 says the time is transmitted as a 32-bit value. */ + uint32_t thetime; struct sockaddr_in from; - int fromlen; + socklen_t fromlen; int type; if (timeout == NULL) @@ -108,7 +109,7 @@ rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep, if (type == SOCK_DGRAM) { res = sendto (s, (char *) &thetime, sizeof (thetime), 0, - (struct sockaddr *) addrp, sizeof (*addrp)); + (struct sockaddr *) addrp, sizeof (*addrp)); if (res < 0) { do_close (s); @@ -129,7 +130,7 @@ rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep, } fromlen = sizeof (from); res = recvfrom (s, (char *) &thetime, sizeof (thetime), 0, - (struct sockaddr *) &from, &fromlen); + (struct sockaddr *) &from, &fromlen); do_close (s); if (res < 0) return -1; @@ -156,3 +157,4 @@ rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep, timep->tv_usec = 0; return 0; } +libc_hidden_def (rtime) |