aboutsummaryrefslogtreecommitdiff
path: root/sunrpc
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-05-17 02:00:04 +0000
committerUlrich Drepper <drepper@redhat.com>2001-05-17 02:00:04 +0000
commitd911bbae4a67f9f152f8ff7d6d52e4ab566aa5e3 (patch)
tree8e3945d742f54d13de0c81aa06a03409f2e8351e /sunrpc
parentf010f4a36f2b6e037a78dfa82ca2f666da1657f9 (diff)
downloadglibc-d911bbae4a67f9f152f8ff7d6d52e4ab566aa5e3.zip
glibc-d911bbae4a67f9f152f8ff7d6d52e4ab566aa5e3.tar.gz
glibc-d911bbae4a67f9f152f8ff7d6d52e4ab566aa5e3.tar.bz2
(rpc_default): Remove. (__rpc_thread_destroy): Use __libc_tsd_RPC_VARS_mem instead of rpc_default. (rpc_thread_multi, __rpc_thread_svc_fdset, __rpc_thread_createerr, __rpc_thread_svc_pollfd, __rpc_thread_svc_max_pollfd): Likewise.
Diffstat (limited to 'sunrpc')
-rw-r--r--sunrpc/rpc_thread.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/sunrpc/rpc_thread.c b/sunrpc/rpc_thread.c
index 1fd1c14..d0dc40b 100644
--- a/sunrpc/rpc_thread.c
+++ b/sunrpc/rpc_thread.c
@@ -9,15 +9,11 @@
#ifdef _RPC_THREAD_SAFE_
-/* Variable used in non-threaded applications. */
+/* Variable used in non-threaded applications or for the first thread. */
static struct rpc_thread_variables __libc_tsd_RPC_VARS_mem;
static struct rpc_thread_variables *__libc_tsd_RPC_VARS_data =
&__libc_tsd_RPC_VARS_mem;
-
-/* This is the variable used for the first thread. */
-static struct rpc_thread_variables rpc_default;
-
/*
* Task-variable destructor
*/
@@ -26,7 +22,7 @@ __rpc_thread_destroy (void)
{
struct rpc_thread_variables *tvp = __rpc_thread_variables();
- if (tvp != NULL && tvp != &rpc_default) {
+ if (tvp != NULL && tvp != &__libc_tsd_RPC_VARS_mem) {
__rpc_thread_svc_cleanup ();
__rpc_thread_clnt_cleanup ();
__rpc_thread_key_cleanup ();
@@ -47,7 +43,7 @@ __rpc_thread_destroy (void)
static void
rpc_thread_multi (void)
{
- __libc_tsd_set (RPC_VARS, &rpc_default);
+ __libc_tsd_set (RPC_VARS, &__libc_tsd_RPC_VARS_mem);
}
@@ -88,7 +84,7 @@ __rpc_thread_svc_fdset (void)
struct rpc_thread_variables *tvp;
tvp = __rpc_thread_variables ();
- if (tvp == &rpc_default)
+ if (tvp == &__libc_tsd_RPC_VARS_mem)
return &svc_fdset;
return &tvp->svc_fdset_s;
}
@@ -99,7 +95,7 @@ __rpc_thread_createerr (void)
struct rpc_thread_variables *tvp;
tvp = __rpc_thread_variables ();
- if (tvp == &rpc_default)
+ if (tvp == &__libc_tsd_RPC_VARS_mem)
return &rpc_createerr;
return &tvp->rpc_createerr_s;
}
@@ -110,7 +106,7 @@ __rpc_thread_svc_pollfd (void)
struct rpc_thread_variables *tvp;
tvp = __rpc_thread_variables ();
- if (tvp == &rpc_default)
+ if (tvp == &__libc_tsd_RPC_VARS_mem)
return &svc_pollfd;
return &tvp->svc_pollfd_s;
}
@@ -121,7 +117,7 @@ __rpc_thread_svc_max_pollfd (void)
struct rpc_thread_variables *tvp;
tvp = __rpc_thread_variables ();
- if (tvp == &rpc_default)
+ if (tvp == &__libc_tsd_RPC_VARS_mem)
return &svc_max_pollfd;
return &tvp->svc_max_pollfd_s;
}