svn commit: trunk/uClibc/libc/inet/rpc

[sjhill at uclibc.org]

Author: sjhill
Date: 2006-02-24 19:21:45 -0800 (Fri, 24 Feb 2006)
New Revision: 14265

Log:
Use the TSD macros and get rid of warnings.


Modified:
   trunk/uClibc/libc/inet/rpc/rpc_thread.c


Changeset:
Modified: trunk/uClibc/libc/inet/rpc/rpc_thread.c
===================================================================
--- trunk/uClibc/libc/inet/rpc/rpc_thread.c	2006-02-25 02:17:44 UTC (rev 14264)
+++ trunk/uClibc/libc/inet/rpc/rpc_thread.c	2006-02-25 03:21:45 UTC (rev 14265)
@@ -18,11 +18,11 @@
 #ifdef __UCLIBC_HAS_THREADS__
 
 #include <bits/libc-tsd.h>
+#include <bits/libc-lock.h>
 
 /* 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;
+__libc_tsd_define (, RPC_VARS)
 
 /*
  * Task-variable destructor
@@ -30,7 +30,7 @@
 void
 __rpc_thread_destroy (void)
 {
-	struct rpc_thread_variables *tvp = __rpc_thread_variables();
+	struct rpc_thread_variables *tvp = __libc_tsd_get (RPC_VARS);
 
 	if (tvp != NULL && tvp != &__libc_tsd_RPC_VARS_mem) {
 		__rpc_thread_svc_cleanup ();
@@ -43,6 +43,7 @@
 		free (tvp->authdes_cache_s);
 		free (tvp->authdes_lru_s);
 		free (tvp);
+		__libc_tsd_set (RPC_VARS, NULL);
 	}
 }
 
@@ -71,7 +72,7 @@
 			if (tvp != NULL)
 				__libc_tsd_set (RPC_VARS, tvp);
 			else
-				tvp = __libc_tsd_RPC_VARS_data;
+				tvp = __libc_tsd_RPC_VARS;
 		}
 	}
 	return tvp;