[nuttx] branch master updated: signal: remove unused SIGCONDTIMEDOUT

[gnutt]

This is an automated email from the ASF dual-hosted git repository.

gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 5651715486 signal: remove unused SIGCONDTIMEDOUT
5651715486 is described below

commit 5651715486ed50df92ad3348da92833ac127153c
Author: Petro Karashchenko <petro.karashche...@gmail.com>
AuthorDate: Tue Mar 21 14:44:47 2023 +0200

    signal: remove unused SIGCONDTIMEDOUT
    
    Signed-off-by: Petro Karashchenko <petro.karashche...@gmail.com>
---
 include/signal.h                      | 8 --------
 libs/libc/string/lib_strsignal.c      | 5 -----
 sched/Kconfig                         | 8 --------
 sched/pthread/pthread_condclockwait.c | 4 ++--
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/include/signal.h b/include/signal.h
index 109bf94efc..d4c1d0578d 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -296,14 +296,6 @@
 
 /* The following are non-standard signal definitions */
 
-#ifndef CONFIG_DISABLE_PTHREAD
-#  ifndef CONFIG_SIG_SIGCONDTIMEDOUT
-#    define SIGCONDTIMEDOUT 30  /* Used in the implementation of 
pthread_cond_timedwait */
-#  else
-#    define SIGCONDTIMEDOUT CONFIG_SIG_SIGCONDTIMEDOUT
-#  endif
-#endif
-
 /* SIGWORK is used to wake up various internal NuttX worker threads */
 
 #if defined(CONFIG_SCHED_WORKQUEUE) || defined(CONFIG_PAGING)
diff --git a/libs/libc/string/lib_strsignal.c b/libs/libc/string/lib_strsignal.c
index 2237dcf749..3e8fe096d6 100644
--- a/libs/libc/string/lib_strsignal.c
+++ b/libs/libc/string/lib_strsignal.c
@@ -160,11 +160,6 @@ FAR char *strsignal(int signum)
 
       /* Non-standard signals */
 
-#ifdef SIGCONDTIMEDOUT
-      case SIGCONDTIMEDOUT:
-        return (FAR char *)"SIGCONDTIMEDOUT";
-#endif
-
 #ifdef SIGWORK
       case SIGWORK:
         return (FAR char *)"SIGWORK";
diff --git a/sched/Kconfig b/sched/Kconfig
index 54c5579a39..8f7a5502eb 100644
--- a/sched/Kconfig
+++ b/sched/Kconfig
@@ -1649,14 +1649,6 @@ config SIG_POLL
 
 comment "Non-standard Signal Numbers"
 
-config SIG_SIGCONDTIMEDOUT
-       int "SIGCONDTIMEDOUT"
-       default 30
-       depends on !DISABLE_PTHREAD
-       ---help---
-               This non-standard signal number is used the implementation of
-               pthread_cond_timedwait(). Default 30.
-
 config SIG_SIGWORK
        int "SIGWORK"
        default 31
diff --git a/sched/pthread/pthread_condclockwait.c 
b/sched/pthread/pthread_condclockwait.c
index f91097b1a3..7012dd7219 100644
--- a/sched/pthread/pthread_condclockwait.c
+++ b/sched/pthread/pthread_condclockwait.c
@@ -141,8 +141,8 @@ int pthread_cond_clockwait(FAR pthread_cond_t *cond,
       ret        = pthread_mutex_give(mutex);
       if (ret == 0)
         {
-          status = nxsem_clockwait_uninterruptible(
-                   &cond->sem, clockid, abstime);
+          status = nxsem_clockwait_uninterruptible(&cond->sem,
+                                                   clockid, abstime);
           if (status < 0)
             {
               ret = -status;