From 8096915018650a598eadaa3222a0e47cd3981a12 Mon Sep 17 00:00:00 2001 From: David Xu Date: Thu, 16 May 2013 03:01:04 +0000 Subject: [PATCH] Return one-based key so that user can check if the key is ever allocated in the first place. Initial patch submitted by: phk --- lib/libthr/thread/thr_spec.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/libthr/thread/thr_spec.c b/lib/libthr/thread/thr_spec.c index 86dc79430f15..46a61059aebb 100644 --- a/lib/libthr/thread/thr_spec.c +++ b/lib/libthr/thread/thr_spec.c @@ -70,7 +70,7 @@ _pthread_key_create(pthread_key_t *key, void (*destructor) (void *)) /* Unlock the key table: */ THR_LOCK_RELEASE(curthread, &_keytable_lock); - *key = i; + *key = i + 1; return (0); } @@ -81,9 +81,10 @@ _pthread_key_create(pthread_key_t *key, void (*destructor) (void *)) } int -_pthread_key_delete(pthread_key_t key) +_pthread_key_delete(pthread_key_t userkey) { struct pthread *curthread = _get_curthread(); + int key = userkey - 1; int ret = 0; if ((unsigned int)key < PTHREAD_KEYS_MAX) { @@ -178,9 +179,10 @@ pthread_key_allocate_data(void) } int -_pthread_setspecific(pthread_key_t key, const void *value) +_pthread_setspecific(pthread_key_t userkey, const void *value) { struct pthread *pthread; + pthread_key_t key = userkey - 1; int ret = 0; /* Point to the running thread: */ @@ -209,9 +211,10 @@ _pthread_setspecific(pthread_key_t key, const void *value) } void * -_pthread_getspecific(pthread_key_t key) +_pthread_getspecific(pthread_key_t userkey) { struct pthread *pthread; + pthread_key_t key = userkey - 1; const void *data; /* Point to the running thread: */