summaryrefslogtreecommitdiff
path: root/sunrpc/clnt_gen.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-03-26 05:17:47 +0000
committerUlrich Drepper <drepper@redhat.com>2001-03-26 05:17:47 +0000
commit543cf8a9e162a9a812770c628fa06c7a256752ee (patch)
tree97fcdc6ddfa94d8a296c808a60768212bbbe1039 /sunrpc/clnt_gen.c
parent5e3114974a1982e53f368a09387d0dad1aad1ec1 (diff)
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_gen.c')
-rw-r--r--sunrpc/clnt_gen.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/sunrpc/clnt_gen.c b/sunrpc/clnt_gen.c
index a4fefb57e5..27e027242b 100644
--- a/sunrpc/clnt_gen.c
+++ b/sunrpc/clnt_gen.c
@@ -87,7 +87,7 @@ clnt_create (const char *hostname, u_long prog, u_long vers,
|| h == NULL)
if (herr != NETDB_INTERNAL || errno != ERANGE)
{
- rpc_createerr.cf_stat = RPC_UNKNOWNHOST;
+ get_rpc_createerr().cf_stat = RPC_UNKNOWNHOST;
return NULL;
}
else
@@ -102,8 +102,9 @@ clnt_create (const char *hostname, u_long prog, u_long vers,
/*
* Only support INET for now
*/
- rpc_createerr.cf_stat = RPC_SYSTEMERROR;
- rpc_createerr.cf_error.re_errno = EAFNOSUPPORT;
+ struct rpc_createerr *ce = &get_rpc_createerr ();
+ ce->cf_stat = RPC_SYSTEMERROR;
+ ce->cf_error.re_errno = EAFNOSUPPORT;
return NULL;
}
sin.sin_family = h->h_addrtype;
@@ -117,8 +118,9 @@ clnt_create (const char *hostname, u_long prog, u_long vers,
|| p == NULL)
if (errno != ERANGE)
{
- rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
- rpc_createerr.cf_error.re_errno = EPFNOSUPPORT;
+ struct rpc_createerr *ce = &get_rpc_createerr ();
+ ce->cf_stat = RPC_UNKNOWNPROTO;
+ ce->cf_error.re_errno = EPFNOSUPPORT;
return NULL;
}
else
@@ -163,8 +165,11 @@ clnt_create (const char *hostname, u_long prog, u_long vers,
#endif
break;
default:
- rpc_createerr.cf_stat = RPC_SYSTEMERROR;
- rpc_createerr.cf_error.re_errno = EPFNOSUPPORT;
+ {
+ struct rpc_createerr *ce = &get_rpc_createerr ();
+ ce->cf_stat = RPC_SYSTEMERROR;
+ ce->cf_error.re_errno = EPFNOSUPPORT;
+ }
return (NULL);
}
return client;