From 133a5a43e996792a90d696f83bfb80202524e238 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 19 Jun 2006 01:16:44 +0000
Subject: dont shadow the socket() function
---
libc/inet/rpc/pm_getmaps.c | 6 +++---
libc/inet/rpc/pm_getport.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'libc')
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;
}
diff --git a/libc/inet/rpc/pm_getport.c b/libc/inet/rpc/pm_getport.c
index 2fca57800..327fb9101 100644
--- a/libc/inet/rpc/pm_getport.c
+++ b/libc/inet/rpc/pm_getport.c
@@ -68,13 +68,13 @@ pmap_getport (address, program, version, protocol)
u_int protocol;
{
u_short port = 0;
- int socket = -1;
+ int _socket = -1;
CLIENT *client;
struct pmap parms;
address->sin_port = htons (PMAPPORT);
client = clntudp_bufcreate (address, PMAPPROG,
- PMAPVERS, timeout, &socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
+ PMAPVERS, timeout, &_socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
if (client != (CLIENT *) NULL)
{
struct rpc_createerr *ce = &get_rpc_createerr ();
@@ -95,7 +95,7 @@ pmap_getport (address, program, version, protocol)
}
CLNT_DESTROY (client);
}
- /* (void)__close(socket); CLNT_DESTROY already closed it */
+ /* (void)__close(_socket); CLNT_DESTROY already closed it */
address->sin_port = 0;
return port;
}
--
cgit v1.2.3