OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki 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
Show Stats 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.

23
sunrpc/clnt_simp.c
View File

@ -6,23 +6,23 @@
* may copy or modify Sun RPC without charge, but are not authorized * may copy or modify Sun RPC without charge, but are not authorized
* to license or distribute it to anyone else except as part of a product or * to license or distribute it to anyone else except as part of a product or
* program developed by the user. * program developed by the user.
* *
* SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
* WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
* PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
* *
* Sun RPC is provided with no support and without any obligation on the * Sun RPC is provided with no support and without any obligation on the
* part of Sun Microsystems, Inc. to assist in its use, correction, * part of Sun Microsystems, Inc. to assist in its use, correction,
* modification or enhancement. * modification or enhancement.
* *
* SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
* INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
* OR ANY PART THEREOF. * OR ANY PART THEREOF.
* *
* In no event will Sun Microsystems, Inc. be liable for any lost revenue * In no event will Sun Microsystems, Inc. be liable for any lost revenue
* or profits or other special, indirect and consequential damages, even if * or profits or other special, indirect and consequential damages, even if
* Sun has been advised of the possibility of such damages. * Sun has been advised of the possibility of such damages.
* *
* Sun Microsystems, Inc. * Sun Microsystems, Inc.
* 2550 Garcia Avenue * 2550 Garcia Avenue
* Mountain View, California 94043 * Mountain View, California 94043
@ -31,7 +31,7 @@
static char sccsid[] = "@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro"; static char sccsid[] = "@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
#endif #endif
/* /*
* clnt_simple.c * clnt_simple.c
* Simplified front end to rpc. * Simplified front end to rpc.
* *
@ -75,11 +75,14 @@ callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out)
} }
if (crp->valid && crp->oldprognum == prognum && crp->oldversnum == versnum if (crp->valid && crp->oldprognum == prognum && crp->oldversnum == versnum
&& strcmp(crp->oldhost, host) == 0) { && strcmp(crp->oldhost, host) == 0) {
/* reuse old client */ /* reuse old client */
} else { } else {
crp->valid = 0; crp->valid = 0;
(void)close(crp->socket); if (crp->socket != RPC_ANYSOCK)
crp->socket = RPC_ANYSOCK; {
(void)close(crp->socket);
crp->socket = RPC_ANYSOCK;
}
if (crp->client) { if (crp->client) {
clnt_destroy(crp->client); clnt_destroy(crp->client);
crp->client = NULL; crp->client = NULL;
@ -103,7 +106,7 @@ callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out)
tottimeout.tv_usec = 0; tottimeout.tv_usec = 0;
clnt_stat = clnt_call(crp->client, procnum, inproc, in, clnt_stat = clnt_call(crp->client, procnum, inproc, in,
outproc, out, tottimeout); outproc, out, tottimeout);
/* /*
* if call failed, empty cache * if call failed, empty cache
*/ */
if (clnt_stat != RPC_SUCCESS) if (clnt_stat != RPC_SUCCESS)

17
sunrpc/clnt_tcp.c
View File

@ -6,23 +6,23 @@
* may copy or modify Sun RPC without charge, but are not authorized * may copy or modify Sun RPC without charge, but are not authorized
* to license or distribute it to anyone else except as part of a product or * to license or distribute it to anyone else except as part of a product or
* program developed by the user. * program developed by the user.
* *
* SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
* WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
* PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
* *
* Sun RPC is provided with no support and without any obligation on the * Sun RPC is provided with no support and without any obligation on the
* part of Sun Microsystems, Inc. to assist in its use, correction, * part of Sun Microsystems, Inc. to assist in its use, correction,
* modification or enhancement. * modification or enhancement.
* *
* SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
* INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
* OR ANY PART THEREOF. * OR ANY PART THEREOF.
* *
* In no event will Sun Microsystems, Inc. be liable for any lost revenue * In no event will Sun Microsystems, Inc. be liable for any lost revenue
* or profits or other special, indirect and consequential damages, even if * or profits or other special, indirect and consequential damages, even if
* Sun has been advised of the possibility of such damages. * Sun has been advised of the possibility of such damages.
* *
* Sun Microsystems, Inc. * Sun Microsystems, Inc.
* 2550 Garcia Avenue * 2550 Garcia Avenue
* Mountain View, California 94043 * Mountain View, California 94043
@ -30,7 +30,7 @@
#if !defined(lint) && defined(SCCSIDS) #if !defined(lint) && defined(SCCSIDS)
static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro"; static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
#endif #endif
/* /*
* clnt_tcp.c, Implements a TCP/IP based, client side RPC. * clnt_tcp.c, Implements a TCP/IP based, client side RPC.
* *
@ -85,7 +85,7 @@ struct ct_data {
bool_t ct_closeit; bool_t ct_closeit;
struct timeval ct_wait; struct timeval ct_wait;
bool_t ct_waitset; /* wait set by clnt_control? */ bool_t ct_waitset; /* wait set by clnt_control? */
struct sockaddr_in ct_addr; struct sockaddr_in ct_addr;
struct rpc_err ct_error; struct rpc_err ct_error;
char ct_mcall[MCALL_MSG_SIZE]; /* marshalled callmsg */ char ct_mcall[MCALL_MSG_SIZE]; /* marshalled callmsg */
u_int ct_mpos; /* pos after marshal */ u_int ct_mpos; /* pos after marshal */
@ -159,7 +159,8 @@ 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;
(void)close(*sockp); if (*sockp >= 0)
(void)close(*sockp);
goto fooy; goto fooy;
} }
ct->ct_closeit = TRUE; ct->ct_closeit = TRUE;

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);
} }