Issue #1338 - Part 1: Update NSPR to 4.24

1 files changed, 184 insertions, 156 deletions

diff --git a/nsprpub/pr/tests/prselect.c b/nsprpub/pr/tests/prselect.c
index 15aa85580..2a81100e8 100644
--- a/nsprpub/pr/tests/prselect.c
+++ b/nsprpub/pr/tests/prselect.c
@@ -12,10 +12,10 @@
 **
 ** Modification History:
 ** 14-May-97 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 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 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.
 ***********************************************************************/
 
 /***********************************************************************
@@ -40,26 +40,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 Test_Result (int result)
 {
-	if (result == PASS)
-		printf ("PASS\n");
-	else
-		printf ("FAIL\n");
+    if (result == PASS) {
+        printf ("PASS\n");
+    }
+    else {
+        printf ("FAIL\n");
+    }
 }
 
 static void
@@ -77,10 +79,10 @@ clientThreadFunc(void *arg)
     PR_snprintf(buf, sizeof(buf), "%hu", port);
 
     for (i = 0; i < 5; i++) {
-	sock = PR_NewTCPSocket();
+        sock = PR_NewTCPSocket();
         PR_Connect(sock, &addr, PR_INTERVAL_NO_TIMEOUT);
-	PR_Write(sock, buf, sizeof(buf));
-	PR_Close(sock);
+        PR_Write(sock, buf, sizeof(buf));
+        PR_Close(sock);
     }
 }
 
@@ -98,91 +100,109 @@ int main(int argc, char **argv)
     PRInt32 retVal;
     PRIntn i, j;
 
-	/* The command line argument: -d is used to determine if the test is being run
-	in debug mode. The regress tool requires only one line output:PASS or FAIL.
-	All of the printfs associated with this test has been handled with a if (debug_mode)
-	test.
-	Usage: test_name -d
-	*/
-	PLOptStatus os;
-	PLOptState *opt = PL_CreateOptState(argc, argv, "d:");
-	while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
+    /* The command line argument: -d is used to determine if the test is being run
+    in debug mode. The regress tool requires only one line output:PASS or FAIL.
+    All of the printfs associated with this test has been handled with a if (debug_mode)
+    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);
+    PL_DestroyOptState(opt);
+
+    /* main test */
 
- /* main test */
-	
     PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
     PR_STDIO_INIT();
 
     if (debug_mode) {
-		printf("This program tests PR_Select with sockets.  Timeout, error\n");
-		printf("reporting, and normal operation are tested.\n\n");
-	}
+        printf("This program tests PR_Select with sockets.  Timeout, error\n");
+        printf("reporting, and normal operation are tested.\n\n");
+    }
 
     /* Create two listening sockets */
     if ((listenSock1 = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
+        fprintf(stderr, "Can't create a new TCP socket\n");
+        if (!debug_mode) {
+            Test_Result(FAIL);
+        }
+        exit(1);
     }
     addr.inet.family = AF_INET;
     addr.inet.ip = PR_htonl(INADDR_ANY);
     addr.inet.port = PR_htons(0);
     if (PR_Bind(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
+        fprintf(stderr, "Can't bind socket\n");
+        if (!debug_mode) {
+            Test_Result(FAIL);
+        }
+        exit(1);
     }
     if (PR_GetSockName(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
+        fprintf(stderr, "PR_GetSockName failed\n");
+        if (!debug_mode) {
+            Test_Result(FAIL);
+        }
+        exit(1);
     }
     listenPort1 = PR_ntohs(addr.inet.port);
     if (PR_Listen(listenSock1, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
+        fprintf(stderr, "Can't listen on a socket\n");
+        if (!debug_mode) {
+            Test_Result(FAIL);
+        }
+        exit(1);
     }
 
     if ((listenSock2  = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
+        fprintf(stderr, "Can't create a new TCP socket\n");
+        if (!debug_mode) {
+            Test_Result(FAIL);
+        }
+        exit(1);
     }
     addr.inet.family = AF_INET;
     addr.inet.ip = PR_htonl(INADDR_ANY);
     addr.inet.port = PR_htons(0);
     if (PR_Bind(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "Can't bind socket\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
+        fprintf(stderr, "Can't bind socket\n");
+        if (!debug_mode) {
+            Test_Result(FAIL);
+        }
+        exit(1);
     }
     if (PR_GetSockName(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
+        fprintf(stderr, "PR_GetSockName failed\n");
+        if (!debug_mode) {
+            Test_Result(FAIL);
+        }
+        exit(1);
     }
     listenPort2 = PR_ntohs(addr.inet.port);
     if (PR_Listen(listenSock2, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	if (!debug_mode) Test_Result(FAIL);
-	exit(1);
+        fprintf(stderr, "Can't listen on a socket\n");
+        if (!debug_mode) {
+            Test_Result(FAIL);
+        }
+        exit(1);
     }
     PR_snprintf(buf, sizeof(buf),
-	    "The server thread is listening on ports %hu and %hu\n\n",
-	    listenPort1, listenPort2);
+                "The server thread is listening on ports %hu and %hu\n\n",
+                listenPort1, listenPort2);
     printf("%s", buf);
 
     /* Set up the fd set */
@@ -191,29 +211,37 @@ int main(int argc, char **argv)
     PR_FD_SET(listenSock2, &readFdSet);
 
     /* Testing timeout */
-    if (debug_mode) printf("PR_Select should time out in 5 seconds\n");
+    if (debug_mode) {
+        printf("PR_Select should time out in 5 seconds\n");
+    }
     retVal = PR_Select(0 /* unused */, &readFdSet, NULL, NULL,
-	    PR_SecondsToInterval(5));
+                       PR_SecondsToInterval(5));
     if (retVal != 0) {
-	PR_snprintf(buf, sizeof(buf),
-		"PR_Select should time out and return 0, but it returns %ld\n",
-		retVal);
-	fprintf(stderr, "%s", buf);
-	if (retVal == -1) {
-	    fprintf(stderr, "Error %d, oserror %d\n", PR_GetError(),
-		    PR_GetOSError());
-			if (!debug_mode) Test_Result(FAIL);
-	}
-	exit(1);
+        PR_snprintf(buf, sizeof(buf),
+                    "PR_Select should time out and return 0, but it returns %ld\n",
+                    retVal);
+        fprintf(stderr, "%s", buf);
+        if (retVal == -1) {
+            fprintf(stderr, "Error %d, oserror %d\n", PR_GetError(),
+                    PR_GetOSError());
+            if (!debug_mode) {
+                Test_Result(FAIL);
+            }
+        }
+        exit(1);
+    }
+    if (debug_mode) {
+        printf("PR_Select timed out.  Test passed.\n\n");
+    }
+    else {
+        Test_Result(PASS);
     }
-    if (debug_mode) printf("PR_Select timed out.  Test passed.\n\n");
-	else Test_Result(PASS);
 
     /* Testing bad fd */
     printf("PR_Select should detect a bad file descriptor\n");
     if ((badFD = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a TCP socket\n");
-	exit(1);
+        fprintf(stderr, "Can't create a TCP socket\n");
+        exit(1);
     }
 
     PR_FD_SET(listenSock1, &readFdSet);
@@ -221,35 +249,35 @@ int main(int argc, char **argv)
     PR_FD_SET(badFD, &readFdSet);
     PR_Close(badFD);  /* make the fd bad */
     retVal = PR_Select(0 /* unused */, &readFdSet, NULL, NULL,
-	    PR_INTERVAL_NO_TIMEOUT);
+                       PR_INTERVAL_NO_TIMEOUT);
     if (retVal != -1 || PR_GetError() != PR_BAD_DESCRIPTOR_ERROR) {
-	fprintf(stderr, "Failed to detect the bad fd: "
-		"PR_Select returns %d\n", retVal);
-	if (retVal == -1) {
-	    fprintf(stderr, "Error %d, oserror %d\n", PR_GetError(),
-		    PR_GetOSError());
-	}
-	exit(1);
+        fprintf(stderr, "Failed to detect the bad fd: "
+                "PR_Select returns %d\n", retVal);
+        if (retVal == -1) {
+            fprintf(stderr, "Error %d, oserror %d\n", PR_GetError(),
+                    PR_GetOSError());
+        }
+        exit(1);
     }
     printf("PR_Select detected a bad fd.  Test passed.\n\n");
     PR_FD_CLR(badFD, &readFdSet);
 
     clientThread = PR_CreateThread(PR_USER_THREAD,
-	    clientThreadFunc, (void *) listenPort1,
-	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-	    PR_UNJOINABLE_THREAD, 0);
+                                   clientThreadFunc, (void *) listenPort1,
+                                   PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
+                                   PR_UNJOINABLE_THREAD, 0);
     if (clientThread == NULL) {
-	fprintf(stderr, "can't create thread\n");
-	exit(1);
+        fprintf(stderr, "can't create thread\n");
+        exit(1);
     }
 
     clientThread = PR_CreateThread(PR_USER_THREAD,
-	    clientThreadFunc, (void *) listenPort2,
-	    PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-	    PR_UNJOINABLE_THREAD, 0);
+                                   clientThreadFunc, (void *) listenPort2,
+                                   PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
+                                   PR_UNJOINABLE_THREAD, 0);
     if (clientThread == NULL) {
-	fprintf(stderr, "can't create thread\n");
-	exit(1);
+        fprintf(stderr, "can't create thread\n");
+        exit(1);
     }
 
     printf("Two client threads are created.  Each of them will\n");
@@ -270,68 +298,68 @@ int main(int argc, char **argv)
     /* 20 events total */
     i = 0;
     while (i < 20) {
-	PRFileDesc **tmp;
-	int nextIndex;
-	int nEvents = 0;
-
-	retVal = PR_Select(0 /* unused */, &readFdSet, NULL, NULL,
-		PR_INTERVAL_NO_TIMEOUT);
-	PR_ASSERT(retVal != 0);  /* no timeout */
-	if (retVal == -1) {
-	    fprintf(stderr, "PR_Select failed (%d, %d)\n", PR_GetError(),
-		    PR_GetOSError());
-	    exit(1);
-	}
-
-	nextIndex = 2;
-	/* the two listening sockets */
-	for (j = 0; j < 2; j++) {
-	    other_fds[j] = fds[j];
-	    if (PR_FD_ISSET(fds[j], &readFdSet)) {
-		PRFileDesc *sock;
-
-		nEvents++;
-		sock = PR_Accept(fds[j], NULL, PR_INTERVAL_NO_TIMEOUT);
-		if (sock == NULL) {
-		    fprintf(stderr, "PR_Accept() failed\n");
-		    exit(1);
-		}
-		other_fds[nextIndex] = sock;
-		PR_FD_SET(sock, &readFdSet);
-		nextIndex++;
-	    }
-	    PR_FD_SET(fds[j], &readFdSet);
-	}
-
-	for (j = 2; j < nfds; j++) {
-	    if (PR_FD_ISSET(fds[j], &readFdSet)) {
-		PRInt32 nBytes;
-
-		PR_FD_CLR(fds[j], &readFdSet);
-		nEvents++;
-		nBytes = PR_Read(fds[j], buf, sizeof(buf));
-		if (nBytes == -1) {
-		    fprintf(stderr, "PR_Read() failed\n");
-		    exit(1);
-		}
-		/* Just to be safe */
-		buf[127] = '\0';
-		PR_Close(fds[j]);
-		printf("The server received \"%s\" from a client\n", buf);
-	    } else {
-		PR_FD_SET(fds[j], &readFdSet);
-		other_fds[nextIndex] = fds[j];
-		nextIndex++;
-	    }
-	}
-
-	PR_ASSERT(retVal == nEvents);
-	/* swap */
-	tmp = fds;
-	fds = other_fds;
-	other_fds = tmp;
-	nfds = nextIndex;
-	i += nEvents;
+        PRFileDesc **tmp;
+        int nextIndex;
+        int nEvents = 0;
+
+        retVal = PR_Select(0 /* unused */, &readFdSet, NULL, NULL,
+                           PR_INTERVAL_NO_TIMEOUT);
+        PR_ASSERT(retVal != 0);  /* no timeout */
+        if (retVal == -1) {
+            fprintf(stderr, "PR_Select failed (%d, %d)\n", PR_GetError(),
+                    PR_GetOSError());
+            exit(1);
+        }
+
+        nextIndex = 2;
+        /* the two listening sockets */
+        for (j = 0; j < 2; j++) {
+            other_fds[j] = fds[j];
+            if (PR_FD_ISSET(fds[j], &readFdSet)) {
+                PRFileDesc *sock;
+
+                nEvents++;
+                sock = PR_Accept(fds[j], NULL, PR_INTERVAL_NO_TIMEOUT);
+                if (sock == NULL) {
+                    fprintf(stderr, "PR_Accept() failed\n");
+                    exit(1);
+                }
+                other_fds[nextIndex] = sock;
+                PR_FD_SET(sock, &readFdSet);
+                nextIndex++;
+            }
+            PR_FD_SET(fds[j], &readFdSet);
+        }
+
+        for (j = 2; j < nfds; j++) {
+            if (PR_FD_ISSET(fds[j], &readFdSet)) {
+                PRInt32 nBytes;
+
+                PR_FD_CLR(fds[j], &readFdSet);
+                nEvents++;
+                nBytes = PR_Read(fds[j], buf, sizeof(buf));
+                if (nBytes == -1) {
+                    fprintf(stderr, "PR_Read() failed\n");
+                    exit(1);
+                }
+                /* Just to be safe */
+                buf[127] = '\0';
+                PR_Close(fds[j]);
+                printf("The server received \"%s\" from a client\n", buf);
+            } else {
+                PR_FD_SET(fds[j], &readFdSet);
+                other_fds[nextIndex] = fds[j];
+                nextIndex++;
+            }
+        }
+
+        PR_ASSERT(retVal == nEvents);
+        /* swap */
+        tmp = fds;
+        fds = other_fds;
+        other_fds = tmp;
+        nfds = nextIndex;
+        i += nEvents;
     }
 
     printf("All tests finished\n");