Issue mcp-graveyard/UXP#1338 - Part 1: Update NSPR to 4.24

1 files changed, 99 insertions, 55 deletions

diff --git a/nsprpub/pr/tests/join.c b/nsprpub/pr/tests/join.c
index ae3873fae0..24238e6e05 100644
--- a/nsprpub/pr/tests/join.c
+++ b/nsprpub/pr/tests/join.c
@@ -10,13 +10,13 @@
 ** Description: Tests PR_SetMallocCountdown PR_ClearMallocCountdown functions.
 **
 ** Modification History:
-** 
+**
 ** 19-May-97 AGarcia - separate the four join tests into different unit test modules.
-**		    AGarcia- Converted the test to accomodate the debug_mode flag.
+**          AGarcia- Converted the test to accomodate the debug_mode flag.
 **          The debug mode will print all of the printfs associated with this test.
-**		    The regress mode will be the default mode. Since the regress tool limits
+**          The regress mode will be the default mode. Since the regress tool limits
 **          the output to a one line status:PASS or FAIL,all of the printf statements
-**		    have been handled with an if (debug_mode) statement. 
+**          have been handled with an if (debug_mode) statement.
 ***********************************************************************/
 
 /***********************************************************************
@@ -35,26 +35,28 @@
 /***********************************************************************
 ** PRIVATE FUNCTION:    Test_Result
 ** DESCRIPTION: Used in conjunction with the regress tool, prints out the
-**		        status of the test case.
+**              status of the test case.
 ** INPUTS:      PASS/FAIL
 ** OUTPUTS:     None
 ** RETURN:      None
 ** SIDE EFFECTS:
-**      
+**
 ** RESTRICTIONS:
 **      None
 ** MEMORY:      NA
 ** ALGORITHM:   Determine what the status is and print accordingly.
-**      
+**
 ***********************************************************************/
 
 
 static void Test_Result (int result)
 {
-    if (result == PASS)
+    if (result == PASS) {
         printf ("PASS\n");
-    else
+    }
+    else {
         printf ("FAIL\n");
+    }
     exit (1);
 }
 
@@ -84,45 +86,65 @@ void runTest(PRThreadScope scope1, PRThreadScope scope2)
     PRThread *low,*high;
 
     /* create the low and high priority threads */
-    
+
     low = PR_CreateThread(PR_USER_THREAD,
-                     lowPriority, 0, 
-                     PR_PRIORITY_LOW,
-                     scope1,
-                     PR_JOINABLE_THREAD,
-                     0);
+                          lowPriority, 0,
+                          PR_PRIORITY_LOW,
+                          scope1,
+                          PR_JOINABLE_THREAD,
+                          0);
     if (!low) {
-        if (debug_mode) printf("\tcannot create low priority thread\n");
-        else Test_Result(FAIL);
+        if (debug_mode) {
+            printf("\tcannot create low priority thread\n");
+        }
+        else {
+            Test_Result(FAIL);
+        }
         return;
     }
 
     high = PR_CreateThread(PR_USER_THREAD,
-                     highPriority, 0, 
-                     PR_PRIORITY_HIGH,
-                     scope2,
-                     PR_JOINABLE_THREAD,
-                     0);
+                           highPriority, 0,
+                           PR_PRIORITY_HIGH,
+                           scope2,
+                           PR_JOINABLE_THREAD,
+                           0);
     if (!high) {
-        if (debug_mode) printf("\tcannot create high priority thread\n");
-        else Test_Result(FAIL);
+        if (debug_mode) {
+            printf("\tcannot create high priority thread\n");
+        }
+        else {
+            Test_Result(FAIL);
+        }
         return;
     }
 
     /* Do the joining for both threads */
     if (PR_JoinThread(low) == PR_FAILURE) {
-        if (debug_mode) printf("\tcannot join low priority thread\n");
-        else Test_Result (FAIL);
+        if (debug_mode) {
+            printf("\tcannot join low priority thread\n");
+        }
+        else {
+            Test_Result (FAIL);
+        }
         return;
     } else {
-        if (debug_mode) printf("\tjoined low priority thread\n");
+        if (debug_mode) {
+            printf("\tjoined low priority thread\n");
+        }
     }
     if (PR_JoinThread(high) == PR_FAILURE) {
-        if (debug_mode) printf("\tcannot join high priority thread\n");
-        else Test_Result(FAIL);
+        if (debug_mode) {
+            printf("\tcannot join high priority thread\n");
+        }
+        else {
+            Test_Result(FAIL);
+        }
         return;
     } else {
-        if (debug_mode) printf("\tjoined high priority thread\n");
+        if (debug_mode) {
+            printf("\tjoined high priority thread\n");
+        }
     }
 }
 
@@ -131,37 +153,57 @@ void joinWithUnjoinable(void)
     PRThread *thread;
 
     /* create the unjoinable thread */
-    
+
     thread = PR_CreateThread(PR_USER_THREAD,
-                     unjoinable, 0, 
-                     PR_PRIORITY_NORMAL,
-                     PR_GLOBAL_THREAD,
-                     PR_UNJOINABLE_THREAD,
-                     0);
+                             unjoinable, 0,
+                             PR_PRIORITY_NORMAL,
+                             PR_GLOBAL_THREAD,
+                             PR_UNJOINABLE_THREAD,
+                             0);
     if (!thread) {
-        if (debug_mode) printf("\tcannot create unjoinable thread\n");
-        else Test_Result(FAIL);
+        if (debug_mode) {
+            printf("\tcannot create unjoinable thread\n");
+        }
+        else {
+            Test_Result(FAIL);
+        }
         return;
     }
 
     if (PR_JoinThread(thread) == PR_SUCCESS) {
-        if (debug_mode) printf("\tsuccessfully joined with unjoinable thread?!\n");
-        else Test_Result(FAIL);
+        if (debug_mode) {
+            printf("\tsuccessfully joined with unjoinable thread?!\n");
+        }
+        else {
+            Test_Result(FAIL);
+        }
         return;
     } else {
-        if (debug_mode) printf("\tcannot join with unjoinable thread, as expected\n");
+        if (debug_mode) {
+            printf("\tcannot join with unjoinable thread, as expected\n");
+        }
         if (PR_GetError() != PR_INVALID_ARGUMENT_ERROR) {
-            if (debug_mode) printf("\tWrong error code\n");
-            else Test_Result(FAIL);
+            if (debug_mode) {
+                printf("\tWrong error code\n");
+            }
+            else {
+                Test_Result(FAIL);
+            }
             return;
         }
     }
     if (PR_Interrupt(thread) == PR_FAILURE) {
-        if (debug_mode) printf("\tcannot interrupt unjoinable thread\n");
-        else Test_Result(FAIL);
+        if (debug_mode) {
+            printf("\tcannot interrupt unjoinable thread\n");
+        }
+        else {
+            Test_Result(FAIL);
+        }
         return;
     } else {
-        if (debug_mode) printf("\tinterrupted unjoinable thread\n");
+        if (debug_mode) {
+            printf("\tinterrupted unjoinable thread\n");
+        }
     }
 }
 
@@ -173,24 +215,26 @@ static PRIntn PR_CALLBACK RealMain(int argc, char **argv)
     test.
     Usage: test_name -d
     */
-    
+
     PLOptStatus os;
     PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
     while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
     {
-        if (PL_OPT_BAD == os) continue;
+        if (PL_OPT_BAD == os) {
+            continue;
+        }
         switch (opt->option)
         {
-        case 'd':  /* debug mode */
-            debug_mode = 1;
-            break;
-         default:
-            break;
+            case 'd':  /* debug mode */
+                debug_mode = 1;
+                break;
+            default:
+                break;
         }
     }
     PL_DestroyOptState(opt);
 
- /* main test */
+    /* main test */
     printf("User-User test\n");
     runTest(PR_LOCAL_THREAD, PR_LOCAL_THREAD);
     printf("User-Kernel test\n");
@@ -213,7 +257,7 @@ static PRIntn PR_CALLBACK RealMain(int argc, char **argv)
 int main(int argc, char **argv)
 {
     PRIntn rv;
-    
+
     PR_STDIO_INIT();
     rv = PR_Initialize(RealMain, argc, argv, 0);
     return rv;