lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-05 19:35:52 +03:00
Code Activity

Cleanups in sunrpc code from NIIBE Yutaka <gniibe@mri.co.jp>.

Browse Source 
* sunrpc/clnt_tcp.c (clnttcp_create): Don't close *SOCKP if it's -1.
	* sunrpc/clnt_simp.c (callrpc): Don't close CRP->socket if it's
	RPC_ANYSOCK.
	* sunrpc/pmap_clnt.c (pmap_set): Don't close SOCKET, since
	CLNT_DESTROY already has.
	(pmap_unset): Likewise.
	* sunrpc/pm_getmaps.c (pmap_getmaps): Likewise.
	* sunrpc/pm_getport.c (pmap_getport): Likewise.
	* sunrpc/pmap_rmt.c (pmap_rmtcall): Likewise.
	* sunrpc/portmap.c (callit): Likewise.
This commit is contained in:
Roland McGrath
1996-05-09 21:50:42 +00:00
parent 05d4c98219
commit c28fb3c893
8 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,5 +1,17 @@
Thu May 9 09:17:46 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> Thu May 9 09:17:46 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
Cleanups in sunrpc code from NIIBE Yutaka <gniibe@mri.co.jp>.
* sunrpc/clnt_tcp.c (clnttcp_create): Don't close *SOCKP if it's -1.
* sunrpc/clnt_simp.c (callrpc): Don't close CRP->socket if it's
RPC_ANYSOCK.
* sunrpc/pmap_clnt.c (pmap_set): Don't close SOCKET, since
CLNT_DESTROY already has.
(pmap_unset): Likewise.
* sunrpc/pm_getmaps.c (pmap_getmaps): Likewise.
* sunrpc/pm_getport.c (pmap_getport): Likewise.
* sunrpc/pmap_rmt.c (pmap_rmtcall): Likewise.
* sunrpc/portmap.c (callit): Likewise.
* Makerules (versioned): Strip whitespace. * Makerules (versioned): Strip whitespace.
* Rules (static-only-routines rule): Remove spurious space in dep. * Rules (static-only-routines rule): Remove spurious space in dep.

3
sunrpc/clnt_simp.c
View File

@@ -78,8 +78,11 @@ callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out)
/* reuse old client */ /* reuse old client */
} else { } else {
crp->valid = 0; crp->valid = 0;
if (crp->socket != RPC_ANYSOCK)
{
(void)close(crp->socket); (void)close(crp->socket);
crp->socket = RPC_ANYSOCK; crp->socket = RPC_ANYSOCK;
}
if (crp->client) { if (crp->client) {
clnt_destroy(crp->client); clnt_destroy(crp->client);
crp->client = NULL; crp->client = NULL;

1
sunrpc/clnt_tcp.c
View File

@@ -159,6 +159,7 @@ clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
sizeof(*raddr)) < 0)) { sizeof(*raddr)) < 0)) {
rpc_createerr.cf_stat = RPC_SYSTEMERROR; rpc_createerr.cf_stat = RPC_SYSTEMERROR;
rpc_createerr.cf_error.re_errno = errno; rpc_createerr.cf_error.re_errno = errno;
if (*sockp >= 0)
(void)close(*sockp); (void)close(*sockp);
goto fooy; goto fooy;
} }

2
sunrpc/pm_getmaps.c
View File

@@ -81,7 +81,7 @@ pmap_getmaps(address)
} }
CLNT_DESTROY(client); CLNT_DESTROY(client);
} }
(void)close(socket); /* (void)close(socket); CLNT_DESTROY already closed it */
address->sin_port = 0; address->sin_port = 0;
return (head); return (head);
} }

2
sunrpc/pm_getport.c
View File

@@ -84,7 +84,7 @@ pmap_getport(address, program, version, protocol)
} }
CLNT_DESTROY(client); CLNT_DESTROY(client);
} }
(void)close(socket); /* (void)close(socket); CLNT_DESTROY already closed it */
address->sin_port = 0; address->sin_port = 0;
return (port); return (port);
} }

4
sunrpc/pmap_clnt.c
View File

@@ -80,7 +80,7 @@ pmap_set(program, version, protocol, port)
return (FALSE); return (FALSE);
} }
CLNT_DESTROY(client); CLNT_DESTROY(client);
(void)close(socket); /* (void)close(socket); CLNT_DESTROY closes it */
return (rslt); return (rslt);
} }
@@ -110,6 +110,6 @@ pmap_unset(program, version)
CLNT_CALL(client, PMAPPROC_UNSET, xdr_pmap, &parms, xdr_bool, &rslt, CLNT_CALL(client, PMAPPROC_UNSET, xdr_pmap, &parms, xdr_bool, &rslt,
tottimeout); tottimeout);
CLNT_DESTROY(client); CLNT_DESTROY(client);
(void)close(socket); /* (void)close(socket); CLNT_DESTROY already closed it */
return (rslt); return (rslt);
} }

2
sunrpc/pmap_rmt.c
View File

@@ -96,7 +96,7 @@ pmap_rmtcall(addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, port_pt
} else { } else {
stat = RPC_FAILED; stat = RPC_FAILED;
} }
(void)close(socket); /* (void)close(socket); CLNT_DESTROY already closed it */
addr->sin_port = 0; addr->sin_port = 0;
return (stat); return (stat);
} }

2
sunrpc/portmap.c
View File

@@ -470,7 +470,7 @@ callit(rqstp, xprt)
AUTH_DESTROY(client->cl_auth); AUTH_DESTROY(client->cl_auth);
clnt_destroy(client); clnt_destroy(client);
} }
(void)close(socket); /* (void)close(socket); clnt_destroy already closed it */
exit(0); exit(0);
} }