diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-23 03:09:05 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-23 03:09:05 +0000 |
| commit | 9fe852f17f0d07dca9f33ef862618a3bd3cb3df0 (patch) | |
| tree | 7777f3d3d32d16ce878ec713f22384ee5d780895 /libc/inet/rpc/pm_getmaps.c | |
| parent | a6624c7cb7f47281f01834c00d31322dfe9b16f2 (diff) | |
| download | uClibc-alpine-9fe852f17f0d07dca9f33ef862618a3bd3cb3df0.tar.bz2 uClibc-alpine-9fe852f17f0d07dca9f33ef862618a3bd3cb3df0.tar.xz | |
Merge from trunk and bring in NPTL changes.
Diffstat (limited to 'libc/inet/rpc/pm_getmaps.c')
| -rw-r--r-- | libc/inet/rpc/pm_getmaps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/inet/rpc/pm_getmaps.c b/libc/inet/rpc/pm_getmaps.c index bd740a0ae..1760adf37 100644 --- a/libc/inet/rpc/pm_getmaps.c +++ b/libc/inet/rpc/pm_getmaps.c @@ -62,7 +62,7 @@ struct pmaplist * pmap_getmaps (struct sockaddr_in *address) { struct pmaplist *head = (struct pmaplist *) NULL; - int socket = -1; + int _socket = -1; struct timeval minutetimeout; CLIENT *client; @@ -72,7 +72,7 @@ pmap_getmaps (struct sockaddr_in *address) /* Don't need a reserved port to get ports from the portmapper. */ client = clnttcp_create (address, PMAPPROG, - PMAPVERS, &socket, 50, 500); + PMAPVERS, &_socket, 50, 500); if (client != (CLIENT *) NULL) { if (CLNT_CALL (client, PMAPPROC_DUMP, (xdrproc_t)xdr_void, NULL, @@ -83,7 +83,7 @@ pmap_getmaps (struct sockaddr_in *address) } CLNT_DESTROY (client); } - /* (void)__close(socket); CLNT_DESTROY already closed it */ + /* (void)__close(_socket); CLNT_DESTROY already closed it */ address->sin_port = 0; return head; } |