PR feedback to eliminate early returns

Author: johnboiles

portable/ThirdParty/GCC/Posix/port.c

@@ -368,21 +368,19 @@ void vPortYield( void )
 
 void vPortDisableInterrupts( void )
 {
-    if( prvIsFreeRTOSThread( pthread_self() ) == pdFALSE )
+    if( prvIsFreeRTOSThread( pthread_self() ) == pdTRUE )
     {
-        return;
+        pthread_sigmask(SIG_BLOCK, &xAllSignals, NULL);
     }
-    pthread_sigmask(SIG_BLOCK, &xAllSignals, NULL);
 }
 /*-----------------------------------------------------------*/
 
 void vPortEnableInterrupts( void )
 {
-    if( prvIsFreeRTOSThread( pthread_self() ) == pdFALSE )
+    if( prvIsFreeRTOSThread( pthread_self() ) == pdTRUE )
     {
-        return;
+        pthread_sigmask(SIG_UNBLOCK, &xAllSignals, NULL);
     }
-    pthread_sigmask(SIG_UNBLOCK, &xAllSignals, NULL);
 }
 /*-----------------------------------------------------------*/
 
@@ -452,32 +450,31 @@ void prvSetupTimerInterrupt( void )
 
 static void vPortSystemTickHandler( int sig )
 {
-    if( prvIsFreeRTOSThread( pthread_self() ) == pdFALSE )
+    if( prvIsFreeRTOSThread( pthread_self() ) == pdTRUE )
     {
-        fprintf( stderr, "vPortSystemTickHandler called from non-FreeRTOS thread\n" );
-        return;
-    }
+        Thread_t * pxThreadToSuspend;
+        Thread_t * pxThreadToResume;
 
-    Thread_t * pxThreadToSuspend;
-    Thread_t * pxThreadToResume;
+        ( void ) sig;
 
-    ( void ) sig;
+        uxCriticalNesting++; /* Signals are blocked in this signal handler. */
 
-    uxCriticalNesting++; /* Signals are blocked in this signal handler. */
+        pxThreadToSuspend = prvGetThreadFromTask( xTaskGetCurrentTaskHandle() );
 
-    pxThreadToSuspend = prvGetThreadFromTask( xTaskGetCurrentTaskHandle() );
+        if( xTaskIncrementTick() != pdFALSE )
+        {
+            /* Select Next Task. */
+            vTaskSwitchContext();
 
-    if( xTaskIncrementTick() != pdFALSE )
-    {
-        /* Select Next Task. */
-        vTaskSwitchContext();
+            pxThreadToResume = prvGetThreadFromTask( xTaskGetCurrentTaskHandle() );
 
-        pxThreadToResume = prvGetThreadFromTask( xTaskGetCurrentTaskHandle() );
+            prvSwitchThread( pxThreadToResume, pxThreadToSuspend );
+        }
 
-        prvSwitchThread( pxThreadToResume, pxThreadToSuspend );
+        uxCriticalNesting--;
+    } else {
+        fprintf( stderr, "vPortSystemTickHandler called from non-FreeRTOS thread\n" );
     }
-
-    uxCriticalNesting--;
 }
 /*-----------------------------------------------------------*/