2009-08-05 Joel Sherrill <joel.sherrill@OARcorp.com>

	* posix/include/rtems/posix/psignal.h, posix/src/mqueuecreatesupp.c,
	posix/src/psignalclearprocesssignals.c,
	posix/src/psignalclearsignals.c: Minor rework to ease coverage
	analysis.

5 files changed, 33 insertions, 13 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index de99703912..43ea5acdea 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,12 @@
 2009-08-05	Joel Sherrill <joel.sherrill@OARcorp.com>
 
+	* posix/include/rtems/posix/psignal.h, posix/src/mqueuecreatesupp.c,
+	posix/src/psignalclearprocesssignals.c,
+	posix/src/psignalclearsignals.c: Minor rework to ease coverage
+	analysis.
+
+2009-08-05	Joel Sherrill <joel.sherrill@OARcorp.com>
+
 	* rtems/include/rtems/rtems/intr.h, rtems/src/intrcatch.c: Disable
 	rtems_interrupt_catch on targets which do not use the simple vectored
 	interrupt model.
diff --git a/cpukit/posix/include/rtems/posix/psignal.h b/cpukit/posix/include/rtems/posix/psignal.h
index 37b138e036..7fbd0e274a 100644
--- a/cpukit/posix/include/rtems/posix/psignal.h
+++ b/cpukit/posix/include/rtems/posix/psignal.h
@@ -119,7 +119,7 @@ void _POSIX_signals_Set_process_signals(
 );
 
 void _POSIX_signals_Clear_process_signals(
-  sigset_t   mask
+  int        signo
 );
 
 /*
diff --git a/cpukit/posix/src/mqueuecreatesupp.c b/cpukit/posix/src/mqueuecreatesupp.c
index 335d1fc74d..0bfa675f21 100644
--- a/cpukit/posix/src/mqueuecreatesupp.c
+++ b/cpukit/posix/src/mqueuecreatesupp.c
@@ -97,10 +97,12 @@ int _POSIX_Message_queue_Create_support(
   }
 
   the_mq = _POSIX_Message_queue_Allocate();
-  if ( !the_mq ) {
-    _Thread_Enable_dispatch();
-    rtems_set_errno_and_return_minus_one( ENFILE );
-  }
+  #if defined(RTEMS_DEBUG)
+    if ( !the_mq ) {
+      _Thread_Enable_dispatch();
+      rtems_set_errno_and_return_minus_one( ENFILE );
+    }
+  #endif
 
   the_mq->process_shared  = pshared;
   the_mq->named = true;
diff --git a/cpukit/posix/src/psignalclearprocesssignals.c b/cpukit/posix/src/psignalclearprocesssignals.c
index 665b85430d..a601fa2406 100644
--- a/cpukit/posix/src/psignalclearprocesssignals.c
+++ b/cpukit/posix/src/psignalclearprocesssignals.c
@@ -35,14 +35,26 @@
  */
 
 void _POSIX_signals_Clear_process_signals(
-  sigset_t   mask
+  int signo
 )
 {
+  sigset_t   mask;
+  bool       clear_signal;
+
+  clear_signal = true;
+  mask         = signo_to_mask( signo );
+
   ISR_Level  level;
 
   _ISR_Disable( level );
-    _POSIX_signals_Pending &= ~mask;
-    if ( !_POSIX_signals_Pending )
-      _Thread_Do_post_task_switch_extension--;
+    if ( _POSIX_signals_Vectors[ signo ].sa_flags == SA_SIGINFO ) {
+      if ( !_Chain_Is_empty( &_POSIX_signals_Siginfo[ signo ] ) )
+       clear_signal = false;
+    }
+    if ( clear_signal ) {
+      _POSIX_signals_Pending &= ~mask;
+      if ( !_POSIX_signals_Pending )
+	_Thread_Do_post_task_switch_extension--;
+    }
   _ISR_Enable( level );
 }
diff --git a/cpukit/posix/src/psignalclearsignals.c b/cpukit/posix/src/psignalclearsignals.c
index 1c4f61fb1d..480ba51b70 100644
--- a/cpukit/posix/src/psignalclearsignals.c
+++ b/cpukit/posix/src/psignalclearsignals.c
@@ -70,8 +70,7 @@ bool _POSIX_signals_Clear_signals(
          if ( _POSIX_signals_Vectors[ signo ].sa_flags == SA_SIGINFO ) {
            psiginfo = (POSIX_signals_Siginfo_node *)
              _Chain_Get_unprotected( &_POSIX_signals_Siginfo[ signo ] );
-           if ( _Chain_Is_empty( &_POSIX_signals_Siginfo[ signo ] ) )
-             _POSIX_signals_Clear_process_signals( mask );
+           _POSIX_signals_Clear_process_signals( signo );
            if ( psiginfo ) {
              *info = psiginfo->Info;
              _Chain_Append_unprotected(
@@ -80,8 +79,8 @@ bool _POSIX_signals_Clear_signals(
              );
            } else
              do_callout = false;
-         } else
-           _POSIX_signals_Clear_process_signals( mask );
+         }
+         _POSIX_signals_Clear_process_signals( signo );
          do_callout = true;
        }
     } else {