posix: Fix return states of pthread_kill()

POSIX mandates that an error code is returned and not -1 plus errno.

Update #2715.

2 files changed, 16 insertions, 25 deletions

diff --git a/cpukit/posix/src/pthreadkill.c b/cpukit/posix/src/pthreadkill.c
index f3e6f88ee5..c301af39b5 100644
--- a/cpukit/posix/src/pthreadkill.c
+++ b/cpukit/posix/src/pthreadkill.c
@@ -23,7 +23,6 @@
 #include <rtems/posix/pthread.h>
 #include <rtems/posix/psignal.h>
 #include <rtems/score/isr.h>
-#include <rtems/seterr.h>
 
 int pthread_kill(
   pthread_t   thread,
@@ -34,11 +33,9 @@ int pthread_kill(
   Thread_Control     *the_thread;
   Objects_Locations  location;
 
-  if ( !sig )
-    rtems_set_errno_and_return_minus_one( EINVAL );
-
-  if ( !is_valid_signo(sig) )
-    rtems_set_errno_and_return_minus_one( EINVAL );
+  if ( !is_valid_signo( sig ) ) {
+    return EINVAL;
+  }
 
   the_thread = _Thread_Get( thread, &location );
   switch ( location ) {
@@ -50,24 +47,22 @@ int pthread_kill(
 
       api = the_thread->API_Extensions[ THREAD_API_POSIX ];
 
-      if ( sig ) {
+      if ( _POSIX_signals_Vectors[ sig ].sa_handler == SIG_IGN ) {
+        _Thread_Enable_dispatch();
+        return 0;
+      }
 
-        if ( _POSIX_signals_Vectors[ sig ].sa_handler == SIG_IGN ) {
-          _Thread_Enable_dispatch();
-          return 0;
-        }
+      /* XXX critical section */
 
-        /* XXX critical section */
+      api->signals_pending |= signo_to_mask( sig );
 
-        api->signals_pending |= signo_to_mask( sig );
+      (void) _POSIX_signals_Unblock_thread( the_thread, sig, NULL );
 
-        (void) _POSIX_signals_Unblock_thread( the_thread, sig, NULL );
+      the_thread->do_post_task_switch_extension = true;
 
-        the_thread->do_post_task_switch_extension = true;
+      if ( _ISR_Is_in_progress() && _Thread_Is_executing( the_thread ) )
+        _ISR_Signals_to_thread_executing = true;
 
-        if ( _ISR_Is_in_progress() && _Thread_Is_executing( the_thread ) )
-          _ISR_Signals_to_thread_executing = true;
-      }
       _Thread_Enable_dispatch();
       return 0;
 
@@ -78,5 +73,5 @@ int pthread_kill(
       break;
   }
 
-  rtems_set_errno_and_return_minus_one( ESRCH );
+  return ESRCH;
 }
diff --git a/testsuites/psxtests/psx04/init.c b/testsuites/psxtests/psx04/init.c
index e9311b9e16..6b6387376b 100644
--- a/testsuites/psxtests/psx04/init.c
+++ b/testsuites/psxtests/psx04/init.c
@@ -536,9 +536,7 @@ void *POSIX_Init(
   puts( "Init: pthread_sigmask - EINVAL (timout->nsec invalid to large)" );
 
   status = pthread_kill( Init_id, 999 );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  rtems_test_assert(  errno == EINVAL );
+  rtems_test_assert( status == EINVAL );
   puts( "Init: pthread_kill - EINVAL (sig invalid)" );
 
   status = pthread_kill( 0, SIGUSR2 );
@@ -548,9 +546,7 @@ void *POSIX_Init(
   puts( "Init: pthread_kill - ESRCH (signal SA_SIGINFO)" );
 
   status = pthread_kill( Init_id, 0 );
-  if ( status != -1 )
-    printf( "status = %d\n", status );
-  rtems_test_assert(  errno == EINVAL );
+  rtems_test_assert( status == EINVAL );
   puts( "Init: pthread_kill - EINVAL (signal = 0)" );
 
   act.sa_handler = SIG_IGN;