i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pthread: add const for pthread_mutex*_get*()

Browse Source 
according to the spec. Fixes #13324.
* code style clean up.
This commit is contained in:
Jérôme Duval
2017-02-21 20:05:02 +01:00
parent 4f10ef40b9
commit 0bec83a85a
3 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/posix/pthread.h
+5 -5
View File
@@ -83,7 +83,7 @@ extern "C" {
/* mutex functions */ /* mutex functions */
extern int pthread_mutex_destroy(pthread_mutex_t *mutex); extern int pthread_mutex_destroy(pthread_mutex_t *mutex);
extern int pthread_mutex_getprioceiling(pthread_mutex_t *mutex, extern int pthread_mutex_getprioceiling(const pthread_mutex_t *mutex,
int *_priorityCeiling); int *_priorityCeiling);
extern int pthread_mutex_init(pthread_mutex_t *mutex, extern int pthread_mutex_init(pthread_mutex_t *mutex,
const pthread_mutexattr_t *attr); const pthread_mutexattr_t *attr);
@@ -97,13 +97,13 @@ extern int pthread_mutex_unlock(pthread_mutex_t *mutex);
/* mutex attribute functions */ /* mutex attribute functions */
extern int pthread_mutexattr_destroy(pthread_mutexattr_t *mutexAttr); extern int pthread_mutexattr_destroy(pthread_mutexattr_t *mutexAttr);
extern int pthread_mutexattr_getprioceiling(pthread_mutexattr_t *mutexAttr, extern int pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *mutexAttr,
int *_priorityCeiling); int *_priorityCeiling);
extern int pthread_mutexattr_getprotocol(pthread_mutexattr_t *mutexAttr, extern int pthread_mutexattr_getprotocol(const pthread_mutexattr_t *mutexAttr,
int *_protocol); int *_protocol);
extern int pthread_mutexattr_getpshared(pthread_mutexattr_t *mutexAttr, extern int pthread_mutexattr_getpshared(const pthread_mutexattr_t *mutexAttr,
int *_processShared); int *_processShared);
extern int pthread_mutexattr_gettype(pthread_mutexattr_t *mutexAttr, extern int pthread_mutexattr_gettype(const pthread_mutexattr_t *mutexAttr,
int *_type); int *_type);
extern int pthread_mutexattr_init(pthread_mutexattr_t *mutexAttr); extern int pthread_mutexattr_init(pthread_mutexattr_t *mutexAttr);
extern int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *mutexAttr, extern int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *mutexAttr,
src/system/libroot/posix/pthread/pthread_mutex.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ pthread_mutex_unlock(pthread_mutex_t* mutex)
int int
pthread_mutex_getprioceiling(pthread_mutex_t* mutex, int* _prioCeiling) pthread_mutex_getprioceiling(const pthread_mutex_t* mutex, int* _prioCeiling)
{ {
if (mutex == NULL || _prioCeiling == NULL) if (mutex == NULL || _prioCeiling == NULL)
return EINVAL; return EINVAL;
src/system/libroot/posix/pthread/pthread_mutexattr.c
+25 -12
View File
@@ -46,7 +46,7 @@ pthread_mutexattr_destroy(pthread_mutexattr_t *_mutexAttr)
int int
pthread_mutexattr_gettype(pthread_mutexattr_t *_mutexAttr, int *_type) pthread_mutexattr_gettype(const pthread_mutexattr_t *_mutexAttr, int *_type)
{ {
pthread_mutexattr *attr; pthread_mutexattr *attr;
@@ -74,40 +74,49 @@ pthread_mutexattr_settype(pthread_mutexattr_t *_mutexAttr, int type)
int int
pthread_mutexattr_getpshared(pthread_mutexattr_t *_mutexAttr, int *_processShared) pthread_mutexattr_getpshared(const pthread_mutexattr_t *_mutexAttr,
int *_processShared)
{ {
pthread_mutexattr *attr; pthread_mutexattr *attr;
if (_mutexAttr == NULL || (attr = *_mutexAttr) == NULL || _processShared == NULL) if (_mutexAttr == NULL || (attr = *_mutexAttr) == NULL
|| _processShared == NULL) {
return B_BAD_VALUE; return B_BAD_VALUE;
}
*_processShared = attr->process_shared ? PTHREAD_PROCESS_SHARED : PTHREAD_PROCESS_PRIVATE; *_processShared = attr->process_shared ? PTHREAD_PROCESS_SHARED
: PTHREAD_PROCESS_PRIVATE;
return B_OK; return B_OK;
} }
int int
pthread_mutexattr_setpshared(pthread_mutexattr_t *_mutexAttr, int processShared) pthread_mutexattr_setpshared(pthread_mutexattr_t *_mutexAttr,
int processShared)
{ {
pthread_mutexattr *attr; pthread_mutexattr *attr;
if (_mutexAttr == NULL || (attr = *_mutexAttr) == NULL if (_mutexAttr == NULL || (attr = *_mutexAttr) == NULL
|| processShared < PTHREAD_PROCESS_PRIVATE || processShared < PTHREAD_PROCESS_PRIVATE
|| processShared > PTHREAD_PROCESS_SHARED) || processShared > PTHREAD_PROCESS_SHARED) {
return B_BAD_VALUE; return B_BAD_VALUE;
}
attr->process_shared = processShared == PTHREAD_PROCESS_SHARED ? true : false; attr->process_shared = processShared == PTHREAD_PROCESS_SHARED;
return B_OK; return B_OK;
} }
int int
pthread_mutexattr_getprioceiling(pthread_mutexattr_t *_mutexAttr, int *_priorityCeiling) pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *_mutexAttr,
int *_priorityCeiling)
{ {
pthread_mutexattr *attr; pthread_mutexattr *attr;
if (_mutexAttr == NULL || (attr = *_mutexAttr) == NULL || _priorityCeiling == NULL) if (_mutexAttr == NULL || (attr = *_mutexAttr) == NULL
|| _priorityCeiling == NULL) {
return B_BAD_VALUE; return B_BAD_VALUE;
}
*_priorityCeiling = 0; *_priorityCeiling = 0;
// not implemented // not implemented
@@ -117,7 +126,8 @@ pthread_mutexattr_getprioceiling(pthread_mutexattr_t *_mutexAttr, int *_priority
int int
pthread_mutexattr_setprioceiling(pthread_mutexattr_t *_mutexAttr, int priorityCeiling) pthread_mutexattr_setprioceiling(pthread_mutexattr_t *_mutexAttr,
int priorityCeiling)
{ {
pthread_mutexattr *attr; pthread_mutexattr *attr;
@@ -130,12 +140,15 @@ pthread_mutexattr_setprioceiling(pthread_mutexattr_t *_mutexAttr, int priorityCe
int int
pthread_mutexattr_getprotocol(pthread_mutexattr_t *_mutexAttr, int *_protocol) pthread_mutexattr_getprotocol(const pthread_mutexattr_t *_mutexAttr,
int *_protocol)
{ {
pthread_mutexattr *attr; pthread_mutexattr *attr;
if (_mutexAttr == NULL || (attr = *_mutexAttr) == NULL || _protocol == NULL) if (_mutexAttr == NULL || (attr = *_mutexAttr) == NULL
|| _protocol == NULL) {
return B_BAD_VALUE; return B_BAD_VALUE;
}
*_protocol = 0; *_protocol = 0;
// not implemented // not implemented