jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-27 13:32:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Make pthread_getspecific() compliant with the final IEEE pthreads

Browse Source 
specification:  return parameter passing changed.
This commit is contained in:
Jeffrey Hsu 1996-11-11 09:05:29 +00:00
parent d7b100f932
commit f258836a24
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=19630
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libc_r/uthread/uthread_spec.c
View File

@ -184,12 +184,12 @@ pthread_setspecific(pthread_key_t key, const void *value)
return (ret);
}
int
pthread_getspecific(pthread_key_t key, void **p_data)
void *
pthread_getspecific(pthread_key_t key)
{
pthread_t pthread;
int rval = 0;
int status;
void *data;
/* Block signals: */
_thread_kern_sig_block(&status);
@ -207,31 +207,31 @@ pthread_getspecific(pthread_key_t key, void **p_data)
}
/* Check for errors: */
if (pthread == NULL || p_data == NULL) {
if (pthread == NULL) {
/* Return an invalid argument error: */
_thread_seterrno(_thread_run, EINVAL);
rval = -1;
data = NULL;
}
/* Check if there is specific data: */
else if (pthread->specific_data != NULL && (key < PTHREAD_KEYS_MAX) && (key_table)) {
/* Check if this key has been used before: */
if (key_table[key].count) {
/* Return the value: */
*p_data = (void *) pthread->specific_data[key];
data = (void *) pthread->specific_data[key];
} else {
/*
* This key has not been used before, so return NULL
* instead:
*/
*p_data = NULL;
data = NULL;
}
} else {
/* No specific data has been created, so just return NULL: */
*p_data = NULL;
data = NULL;
}
/* Unblock signals: */
_thread_kern_sig_unblock(status);
return (rval);
return (data);
}
#endif

18
lib/libkse/thread/thr_spec.c
View File

@ -184,12 +184,12 @@ pthread_setspecific(pthread_key_t key, const void *value)
return (ret);
}
int
pthread_getspecific(pthread_key_t key, void **p_data)
void *
pthread_getspecific(pthread_key_t key)
{
pthread_t pthread;
int rval = 0;
int status;
void *data;
/* Block signals: */
_thread_kern_sig_block(&status);
@ -207,31 +207,31 @@ pthread_getspecific(pthread_key_t key, void **p_data)
}
/* Check for errors: */
if (pthread == NULL || p_data == NULL) {
if (pthread == NULL) {
/* Return an invalid argument error: */
_thread_seterrno(_thread_run, EINVAL);
rval = -1;
data = NULL;
}
/* Check if there is specific data: */
else if (pthread->specific_data != NULL && (key < PTHREAD_KEYS_MAX) && (key_table)) {
/* Check if this key has been used before: */
if (key_table[key].count) {
/* Return the value: */
*p_data = (void *) pthread->specific_data[key];
data = (void *) pthread->specific_data[key];
} else {
/*
* This key has not been used before, so return NULL
* instead:
*/
*p_data = NULL;
data = NULL;
}
} else {
/* No specific data has been created, so just return NULL: */
*p_data = NULL;
data = NULL;
}
/* Unblock signals: */
_thread_kern_sig_unblock(status);
return (rval);
return (data);
}
#endif

18
lib/libpthread/thread/thr_spec.c
View File

@ -184,12 +184,12 @@ pthread_setspecific(pthread_key_t key, const void *value)
return (ret);
}
int
pthread_getspecific(pthread_key_t key, void **p_data)
void *
pthread_getspecific(pthread_key_t key)
{
pthread_t pthread;
int rval = 0;
int status;
void *data;
/* Block signals: */
_thread_kern_sig_block(&status);
@ -207,31 +207,31 @@ pthread_getspecific(pthread_key_t key, void **p_data)
}
/* Check for errors: */
if (pthread == NULL || p_data == NULL) {
if (pthread == NULL) {
/* Return an invalid argument error: */
_thread_seterrno(_thread_run, EINVAL);
rval = -1;
data = NULL;
}
/* Check if there is specific data: */
else if (pthread->specific_data != NULL && (key < PTHREAD_KEYS_MAX) && (key_table)) {
/* Check if this key has been used before: */
if (key_table[key].count) {
/* Return the value: */
*p_data = (void *) pthread->specific_data[key];
data = (void *) pthread->specific_data[key];
} else {
/*
* This key has not been used before, so return NULL
* instead:
*/
*p_data = NULL;
data = NULL;
}
} else {
/* No specific data has been created, so just return NULL: */
*p_data = NULL;
data = NULL;
}
/* Unblock signals: */
_thread_kern_sig_unblock(status);
return (rval);
return (data);
}
#endif