Issue #1338 - Part 1: Update NSPR to 4.24

1 files changed, 78 insertions, 78 deletions

diff --git a/nsprpub/pr/tests/poll_er.c b/nsprpub/pr/tests/poll_er.c
index a50a75fbb..b3a751d83 100755
--- a/nsprpub/pr/tests/poll_er.c
+++ b/nsprpub/pr/tests/poll_er.c
@@ -12,23 +12,14 @@
 **
 ** Modification History:
 ** 19-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.
 ** 04-June-97 AGarcia removed the Test_Result function. Regress tool has been updated to
-**			recognize the return code from tha main program.
+**          recognize the return code from tha main program.
 ***********************************************************************/
 
-#ifdef XP_BEOS
-#include <stdio.h>
-int main()
-{
-    printf( "This test is not ported to the BeOS\n" );
-    return 0;
-}
-#else
-
 /***********************************************************************
 ** Includes
 ***********************************************************************/
@@ -73,92 +64,96 @@ int main(int argc, char **argv)
     PRIntn npds;
     PRInt32 retVal;
 
-	/* 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_Poll with sockets.\n");
-		printf("error reporting is  tested.\n\n");
-	}
+        printf("This program tests PR_Poll with sockets.\n");
+        printf("error reporting is  tested.\n\n");
+    }
 
     /* Create two listening sockets */
     if ((listenSock1 = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	failed_already=1;
-	goto exit_now;
+        fprintf(stderr, "Can't create a new TCP socket\n");
+        failed_already=1;
+        goto exit_now;
     }
     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");
-	failed_already=1;
-	goto exit_now;
+        fprintf(stderr, "Can't bind socket\n");
+        failed_already=1;
+        goto exit_now;
     }
     if (PR_GetSockName(listenSock1, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	failed_already=1;
-	goto exit_now;
+        fprintf(stderr, "PR_GetSockName failed\n");
+        failed_already=1;
+        goto exit_now;
     }
     listenPort1 = PR_ntohs(addr.inet.port);
     if (PR_Listen(listenSock1, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	failed_already=1;
-	goto exit_now;
+        fprintf(stderr, "Can't listen on a socket\n");
+        failed_already=1;
+        goto exit_now;
     }
 
     if ((listenSock2  = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a new TCP socket\n");
-	failed_already=1;	
-	goto exit_now;
+        fprintf(stderr, "Can't create a new TCP socket\n");
+        failed_already=1;
+        goto exit_now;
     }
     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");
-	failed_already=1;	
-	goto exit_now;
+        fprintf(stderr, "Can't bind socket\n");
+        failed_already=1;
+        goto exit_now;
     }
     if (PR_GetSockName(listenSock2, &addr) == PR_FAILURE) {
-	fprintf(stderr, "PR_GetSockName failed\n");
-	failed_already=1;	
-	goto exit_now;
+        fprintf(stderr, "PR_GetSockName failed\n");
+        failed_already=1;
+        goto exit_now;
     }
     listenPort2 = PR_ntohs(addr.inet.port);
     if (PR_Listen(listenSock2, 5) == PR_FAILURE) {
-	fprintf(stderr, "Can't listen on a socket\n");
-	failed_already=1;	
-	goto exit_now;
+        fprintf(stderr, "Can't listen on a socket\n");
+        failed_already=1;
+        goto exit_now;
     }
     PR_snprintf(buf, sizeof(buf),
-	    "The server thread is listening on ports %hu and %hu\n\n",
-	    listenPort1, listenPort2);
-    if (debug_mode) printf("%s", buf);
+                "The server thread is listening on ports %hu and %hu\n\n",
+                listenPort1, listenPort2);
+    if (debug_mode) {
+        printf("%s", buf);
+    }
 
     /* Set up the poll descriptor array */
     pds = pds0;
@@ -172,10 +167,12 @@ int main(int argc, char **argv)
 
 
     /* Testing bad fd */
-    if (debug_mode) printf("PR_Poll should detect a bad file descriptor\n");
+    if (debug_mode) {
+        printf("PR_Poll should detect a bad file descriptor\n");
+    }
     if ((badFD = PR_NewTCPSocket()) == NULL) {
-	fprintf(stderr, "Can't create a TCP socket\n");
-	goto exit_now;
+        fprintf(stderr, "Can't create a TCP socket\n");
+        goto exit_now;
     }
 
     pds[2].fd = badFD;
@@ -183,28 +180,31 @@ int main(int argc, char **argv)
     npds = 3;
 
     if (PR_CreateThread(PR_USER_THREAD, ClientThreadFunc,
-            badFD, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-            PR_UNJOINABLE_THREAD, 0) == NULL) {
+                        badFD, PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
+                        PR_UNJOINABLE_THREAD, 0) == NULL) {
         fprintf(stderr, "cannot create thread\n");
         exit(1);
     }
 
     retVal = PR_Poll(pds, npds, PR_INTERVAL_NO_TIMEOUT);
     if (retVal != 1 || (unsigned short) pds[2].out_flags != PR_POLL_NVAL) {
-	fprintf(stderr, "Failed to detect the bad fd: "
-		"PR_Poll returns %d, out_flags is 0x%hx\n",
-		retVal, pds[2].out_flags);
-	failed_already=1;	
-	goto exit_now;
+        fprintf(stderr, "Failed to detect the bad fd: "
+                "PR_Poll returns %d, out_flags is 0x%hx\n",
+                retVal, pds[2].out_flags);
+        failed_already=1;
+        goto exit_now;
+    }
+    if (debug_mode) {
+        printf("PR_Poll detected the bad fd.  Test passed.\n\n");
     }
-    if (debug_mode) printf("PR_Poll detected the bad fd.  Test passed.\n\n");
     PR_Cleanup();
-	goto exit_now;
+    goto exit_now;
 exit_now:
-	if(failed_already)	
-		return 1;
-	else
-		return 0;
+    if(failed_already) {
+        return 1;
+    }
+    else {
+        return 0;
+    }
 }
 
-#endif /* XP_BEOS */