sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pthread_mutexinit: fix deadcode in pthread_mutexinit

Browse Source 
Signed-off-by: zhuyanlin <zhuyanlin1@xiaomi.com>
This commit is contained in:
zhuyanlin 2022-04-28 19:34:26 +08:00 committed by Petro Karashchenko
parent 3bac0d8367
commit 1c977e97d2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/libc/pthread/pthread_mutexattr_setrobust.c
View File

@ -62,7 +62,7 @@ int pthread_mutexattr_setrobust(pthread_mutexattr_t *attr, int robust)
#elif defined(CONFIG_PTHREAD_MUTEX_BOTH) #elif defined(CONFIG_PTHREAD_MUTEX_BOTH)
if (attr != NULL && (robust == PTHREAD_MUTEX_STALLED || if (attr != NULL && (robust == PTHREAD_MUTEX_STALLED ||
robust == _PTHREAD_MFLAGS_ROBUST)) robust == PTHREAD_MUTEX_ROBUST))
{ {
attr->robust = robust; attr->robust = robust;
return OK; return OK;

11
sched/pthread/pthread_mutexinit.c
View File

@ -69,9 +69,9 @@ int pthread_mutex_init(FAR pthread_mutex_t *mutex,
#endif #endif
#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE #ifndef CONFIG_PTHREAD_MUTEX_UNSAFE
#ifdef CONFIG_PTHREAD_MUTEX_DEFAULT_UNSAFE #ifdef CONFIG_PTHREAD_MUTEX_DEFAULT_UNSAFE
uint8_t robust = PTHREAD_MUTEX_STALLED; uint8_t flags = 0;
#else #else
uint8_t robust = PTHREAD_MUTEX_ROBUST; uint8_t flags = _PTHREAD_MFLAGS_ROBUST;
#endif #endif
#endif #endif
int ret = OK; int ret = OK;
@ -97,7 +97,8 @@ int pthread_mutex_init(FAR pthread_mutex_t *mutex,
type = attr->type; type = attr->type;
#endif #endif
#ifdef CONFIG_PTHREAD_MUTEX_BOTH #ifdef CONFIG_PTHREAD_MUTEX_BOTH
robust = attr->robust; flags = attr->robust == PTHREAD_MUTEX_ROBUST ?
_PTHREAD_MFLAGS_ROBUST : 0;
#endif #endif
} }
@ -127,8 +128,8 @@ int pthread_mutex_init(FAR pthread_mutex_t *mutex,
/* Initial internal fields of the mutex */ /* Initial internal fields of the mutex */
mutex->flink = NULL; mutex->flink = NULL;
mutex->flags = (robust == PTHREAD_MUTEX_ROBUST ?
_PTHREAD_MFLAGS_ROBUST : 0); mutex->flags = flags;
#endif #endif
#ifdef CONFIG_PTHREAD_MUTEX_TYPES #ifdef CONFIG_PTHREAD_MUTEX_TYPES