diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-03-26 05:17:47 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-03-26 05:17:47 +0000 |
| commit | 543cf8a9e162a9a812770c628fa06c7a256752ee (patch) | |
| tree | 97fcdc6ddfa94d8a296c808a60768212bbbe1039 /sunrpc/clnt_tcp.c | |
| parent | 5e3114974a1982e53f368a09387d0dad1aad1ec1 (diff) | |
| download | glibc-543cf8a9e162a9a812770c628fa06c7a256752ee.tar glibc-543cf8a9e162a9a812770c628fa06c7a256752ee.tar.gz glibc-543cf8a9e162a9a812770c628fa06c7a256752ee.tar.bz2 glibc-543cf8a9e162a9a812770c628fa06c7a256752ee.zip | |
Update.
Add changes which were in this form in the original patch by
Eric Norum <eric.norum@usask.ca>.
* include/rpc/rpc.h: Remove svc_fdset, rpc_createerr, svc_pollfd, and
svc_max_pollfd.
* sunrpc/rpc/rpc.h: Declare __rpc_thread_svc_fdset,
__rpc_thread_createerr, __rpc_thread_svc_pollfd, and
__rpc_thread_svc_max_pollfd.
Define svc_fdset, get_rpc_createerr, svc_pollfd, and
svc_max_pollfd.
* sunrpc/rpc_thread.c: Handle first thread special, it uses the
global variables.
Define __rpc_thread_svc_fdset, __rpc_thread_createerr,
__rpc_thread_svc_pollfd, and __rpc_thread_svc_max_pollfd.
* sunrpc/Versions [libc] (GLIBC_2.2.3): Export __rpc_thread_svc_fdset,
__rpc_thread_createerr, __rpc_thread_svc_pollfd, and
__rpc_thread_svc_max_pollfd.
* sunrpc/clnt_gen.c: Replace use of rpc_createerr by call to
get_rpc_createerr.
* sunrpc/clnt_perr.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/clnt_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
Diffstat (limited to 'sunrpc/clnt_tcp.c')
| -rw-r--r-- | sunrpc/clnt_tcp.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c index ad53d576d6..e3076524a7 100644 --- a/sunrpc/clnt_tcp.c +++ b/sunrpc/clnt_tcp.c @@ -123,17 +123,19 @@ clnttcp_create (struct sockaddr_in *raddr, u_long prog, u_long vers, h = (CLIENT *) mem_alloc (sizeof (*h)); if (h == NULL) { + struct rpc_createerr *ce = &get_rpc_createerr (); (void) fprintf (stderr, _("clnttcp_create: out of memory\n")); - rpc_createerr.cf_stat = RPC_SYSTEMERROR; - rpc_createerr.cf_error.re_errno = errno; + ce->cf_stat = RPC_SYSTEMERROR; + ce->cf_error.re_errno = errno; goto fooy; } /* ct = (struct ct_data *) mem_alloc (sizeof (*ct)); */ if (ct == NULL) { + struct rpc_createerr *ce = &get_rpc_createerr (); (void) fprintf (stderr, _("clnttcp_create: out of memory\n")); - rpc_createerr.cf_stat = RPC_SYSTEMERROR; - rpc_createerr.cf_error.re_errno = errno; + ce->cf_stat = RPC_SYSTEMERROR; + ce->cf_error.re_errno = errno; goto fooy; } @@ -163,8 +165,9 @@ clnttcp_create (struct sockaddr_in *raddr, u_long prog, u_long vers, || (__connect (*sockp, (struct sockaddr *) raddr, sizeof (*raddr)) < 0)) { - rpc_createerr.cf_stat = RPC_SYSTEMERROR; - rpc_createerr.cf_error.re_errno = errno; + struct rpc_createerr *ce = &get_rpc_createerr (); + ce->cf_stat = RPC_SYSTEMERROR; + ce->cf_error.re_errno = errno; if (*sockp >= 0) (void) __close (*sockp); goto fooy; |