svn commit: trunk/uClibc/libc/inet/rpc

[vapier at uclibc.org]

Author: vapier
Date: 2006-06-18 18:16:44 -0700 (Sun, 18 Jun 2006)
New Revision: 15425

Log:
dont shadow the socket() function

Modified:
   trunk/uClibc/libc/inet/rpc/pm_getmaps.c
   trunk/uClibc/libc/inet/rpc/pm_getport.c


Changeset:
Modified: trunk/uClibc/libc/inet/rpc/pm_getmaps.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/pm_getmaps.c	2006-06-19 01:13:53 UTC (rev 15424)
+++ trunk/uClibc/libc/inet/rpc/pm_getmaps.c	2006-06-19 01:16:44 UTC (rev 15425)
@@ -62,7 +62,7 @@
 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 @@
 
   /* 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 @@
 	}
       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;
 }

Modified: trunk/uClibc/libc/inet/rpc/pm_getport.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/pm_getport.c	2006-06-19 01:13:53 UTC (rev 15424)
+++ trunk/uClibc/libc/inet/rpc/pm_getport.c	2006-06-19 01:16:44 UTC (rev 15425)
@@ -68,13 +68,13 @@
      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 @@
 	}
       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;
 }