diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2006-01-29 15:58:07 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-01-29 15:58:07 +0000 |
| commit | d3979e749bc83ad34f1471edcdbe99822166ded0 (patch) | |
| tree | e9e075ed296adea958a403378a557f46e99900f9 | |
| parent | b7f5cf144f495b7779655db7ad70d1f9b6e0d52c (diff) | |
sync with glibc and rename socket vars to _socket
| -rw-r--r-- | libc/inet/rpc/pmap_clnt.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libc/inet/rpc/pmap_clnt.c b/libc/inet/rpc/pmap_clnt.c index c4bce4f3b..8ac41f281 100644 --- a/libc/inet/rpc/pmap_clnt.c +++ b/libc/inet/rpc/pmap_clnt.c @@ -127,7 +127,7 @@ bool_t pmap_set (u_long program, u_long version, int protocol, u_short port) { struct sockaddr_in myaddress; - int socket = -1; + int _socket = -1; CLIENT *client; struct pmap parms; bool_t rslt; @@ -135,7 +135,7 @@ pmap_set (u_long program, u_long version, int protocol, u_short port) if (!__get_myaddress (&myaddress)) return FALSE; client = clntudp_bufcreate (&myaddress, PMAPPROG, PMAPVERS, - timeout, &socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); + timeout, &_socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); if (client == (CLIENT *) NULL) return (FALSE); parms.pm_prog = program; @@ -147,13 +147,13 @@ pmap_set (u_long program, u_long version, int protocol, u_short port) tottimeout) != RPC_SUCCESS) { clnt_perror (client, _("Cannot register service")); - return FALSE; + rslt = FALSE; } CLNT_DESTROY (client); - /* (void)close(socket); CLNT_DESTROY closes it */ + /* (void)close(_socket); CLNT_DESTROY closes it */ return rslt; } -libc_hidden_def(pmap_set) +libc_hidden_def (pmap_set) /* * Remove the mapping between program,version and port. @@ -164,7 +164,7 @@ bool_t pmap_unset (u_long program, u_long version) { struct sockaddr_in myaddress; - int socket = -1; + int _socket = -1; CLIENT *client; struct pmap parms; bool_t rslt; @@ -172,7 +172,7 @@ pmap_unset (u_long program, u_long version) if (!__get_myaddress (&myaddress)) return FALSE; client = clntudp_bufcreate (&myaddress, PMAPPROG, PMAPVERS, - timeout, &socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); + timeout, &_socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); if (client == (CLIENT *) NULL) return FALSE; parms.pm_prog = program; @@ -181,7 +181,7 @@ pmap_unset (u_long program, u_long version) CLNT_CALL (client, PMAPPROC_UNSET, (xdrproc_t)xdr_pmap, (caddr_t)&parms, (xdrproc_t)xdr_bool, (caddr_t)&rslt, tottimeout); CLNT_DESTROY (client); - /* (void)close(socket); CLNT_DESTROY already closed it */ + /* (void)close(_socket); CLNT_DESTROY already closed it */ return rslt; } -libc_hidden_def(pmap_unset) +libc_hidden_def (pmap_unset) |