diff options
| author | Roland McGrath <roland@gnu.org> | 1996-05-09 21:50:42 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-05-09 21:50:42 +0000 |
| commit | c28fb3c8935a8308d20d08bd45e1fa637a6f69bf (patch) | |
| tree | 664e7f71b30e69b456fb46fadfa488e65058fa28 /sunrpc/clnt_simp.c | |
| parent | 05d4c982198805983d6d7a39b08b1d75eac79387 (diff) | |
| download | glibc-c28fb3c8935a8308d20d08bd45e1fa637a6f69bf.tar.gz glibc-c28fb3c8935a8308d20d08bd45e1fa637a6f69bf.tar.xz glibc-c28fb3c8935a8308d20d08bd45e1fa637a6f69bf.zip | |
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.
Diffstat (limited to 'sunrpc/clnt_simp.c')
| -rw-r--r-- | sunrpc/clnt_simp.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sunrpc/clnt_simp.c b/sunrpc/clnt_simp.c index 043ce0a3eb..e289b3400d 100644 --- a/sunrpc/clnt_simp.c +++ b/sunrpc/clnt_simp.c @@ -6,23 +6,23 @@ * 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 * program developed by the user. - * + * * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR * 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 * part of Sun Microsystems, Inc. to assist in its use, correction, * modification or enhancement. - * + * * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC * OR ANY PART THEREOF. - * + * * In no event will Sun Microsystems, Inc. be liable for any lost revenue * or profits or other special, indirect and consequential damages, even if * Sun has been advised of the possibility of such damages. - * + * * Sun Microsystems, Inc. * 2550 Garcia Avenue * Mountain View, California 94043 @@ -31,7 +31,7 @@ static char sccsid[] = "@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro"; #endif -/* +/* * clnt_simple.c * 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 && strcmp(crp->oldhost, host) == 0) { - /* reuse old client */ + /* reuse old client */ } else { crp->valid = 0; - (void)close(crp->socket); - crp->socket = RPC_ANYSOCK; + if (crp->socket != RPC_ANYSOCK) + { + (void)close(crp->socket); + crp->socket = RPC_ANYSOCK; + } if (crp->client) { clnt_destroy(crp->client); crp->client = NULL; @@ -103,7 +106,7 @@ callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out) tottimeout.tv_usec = 0; clnt_stat = clnt_call(crp->client, procnum, inproc, in, outproc, out, tottimeout); - /* + /* * if call failed, empty cache */ if (clnt_stat != RPC_SUCCESS) |