Issue #1338 - Part 1: Update NSPR to 4.24

1 files changed, 113 insertions, 105 deletions

diff --git a/nsprpub/pr/tests/fileio.c b/nsprpub/pr/tests/fileio.c
index be611a358..a0be3bb10 100644
--- a/nsprpub/pr/tests/fileio.c
+++ b/nsprpub/pr/tests/fileio.c
@@ -7,16 +7,16 @@
 **
 ** Name: fileio.c
 **
-** Description: Program to copy one file to another. 
+** Description: Program to copy one file to another.
 **
 ** 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.
 ** 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.
 ** 12-June-97 Revert to return code 0 and 1, remove debug option (obsolete).
 ***********************************************************************/
 
@@ -47,137 +47,145 @@ PRIntn failed_already=0;
 PRIntn debug_mode;
 static void InitialSetup(void)
 {
-	PRUintn	i;
-	PRInt32 nWritten, rv;
-	
-	t1 = PR_Open("t1.tmp", PR_CREATE_FILE | PR_RDWR, 0);
-	PR_ASSERT(t1 != NULL);	
-	
-	for (i=0; i<TBSIZE; i++)
-		tbuf[i] = i;
-		
-	nWritten = PR_Write((PRFileDesc*)t1, tbuf, TBSIZE);
-	PR_ASSERT(nWritten == TBSIZE);	
-   		
-	rv = PR_Seek(t1,0,PR_SEEK_SET);
-	PR_ASSERT(rv == 0);	
-
-   	t2 = PR_Open("t2.tmp", PR_CREATE_FILE | PR_RDWR, 0);
-	PR_ASSERT(t2 != NULL);	
+    PRUintn i;
+    PRInt32 nWritten, rv;
+
+    t1 = PR_Open("t1.tmp", PR_CREATE_FILE | PR_RDWR, 0);
+    PR_ASSERT(t1 != NULL);
+
+    for (i=0; i<TBSIZE; i++) {
+        tbuf[i] = i;
+    }
+
+    nWritten = PR_Write((PRFileDesc*)t1, tbuf, TBSIZE);
+    PR_ASSERT(nWritten == TBSIZE);
+
+    rv = PR_Seek(t1,0,PR_SEEK_SET);
+    PR_ASSERT(rv == 0);
+
+    t2 = PR_Open("t2.tmp", PR_CREATE_FILE | PR_RDWR, 0);
+    PR_ASSERT(t2 != NULL);
 }
 
 
 static void VerifyAndCleanup(void)
 {
-	PRUintn	i;
-	PRInt32 nRead, rv;
-	
-	for (i=0; i<TBSIZE; i++)
-		tbuf[i] = 0;
-		
-	rv = PR_Seek(t2,0,PR_SEEK_SET);
-	PR_ASSERT(rv == 0);	
-
-	nRead = PR_Read((PRFileDesc*)t2, tbuf, TBSIZE);
-	PR_ASSERT(nRead == TBSIZE);	
-   		
-	for (i=0; i<TBSIZE; i++)
-		if (tbuf[i] != (PRUint8)i) {
-			if (debug_mode) printf("data mismatch for index= %d \n", i);
-			else failed_already=1;
-		}
-   	PR_Close(t1);
-   	PR_Close(t2);
-
-   	PR_Delete("t1.tmp");
-   	PR_Delete("t2.tmp");
-
-    if (debug_mode) printf("fileio test passed\n");
+    PRUintn i;
+    PRInt32 nRead, rv;
+
+    for (i=0; i<TBSIZE; i++) {
+        tbuf[i] = 0;
+    }
+
+    rv = PR_Seek(t2,0,PR_SEEK_SET);
+    PR_ASSERT(rv == 0);
+
+    nRead = PR_Read((PRFileDesc*)t2, tbuf, TBSIZE);
+    PR_ASSERT(nRead == TBSIZE);
+
+    for (i=0; i<TBSIZE; i++)
+        if (tbuf[i] != (PRUint8)i) {
+            if (debug_mode) {
+                printf("data mismatch for index= %d \n", i);
+            }
+            else {
+                failed_already=1;
+            }
+        }
+    PR_Close(t1);
+    PR_Close(t2);
+
+    PR_Delete("t1.tmp");
+    PR_Delete("t2.tmp");
+
+    if (debug_mode) {
+        printf("fileio test passed\n");
+    }
 }
 
 
 /*------------------ Following is the real test program ---------*/
 /*
-	Program to copy one file to another.  Two temporary files get
-	created.  First one gets written in one write call.  Then,
-	a reader thread reads from this file into a double buffer.
-	The writer thread writes from double buffer into the other
-	temporary file.  The second temporary file gets verified
-	for accurate data.
+    Program to copy one file to another.  Two temporary files get
+    created.  First one gets written in one write call.  Then,
+    a reader thread reads from this file into a double buffer.
+    The writer thread writes from double buffer into the other
+    temporary file.  The second temporary file gets verified
+    for accurate data.
 */
 
-PRSemaphore	*emptyBufs;	/* number of empty buffers */
-PRSemaphore *fullBufs;	/* number of buffers that are full */
+PRSemaphore *emptyBufs; /* number of empty buffers */
+PRSemaphore *fullBufs;  /* number of buffers that are full */
 
-#define BSIZE	100
+#define BSIZE   100
 
 struct {
-	char data[BSIZE];
-	PRUintn nbytes;		/* number of bytes in this buffer */
+    char data[BSIZE];
+    PRUintn nbytes;     /* number of bytes in this buffer */
 } buf[2];
 
 static void PR_CALLBACK reader(void *arg)
 {
-	PRUintn	i = 0;
-	PRInt32	nbytes;
-	
-	do {
-		(void) PR_WaitSem(emptyBufs);
-		nbytes = PR_Read((PRFileDesc*)arg, buf[i].data, BSIZE);
-		if (nbytes >= 0) {
-			buf[i].nbytes = nbytes;
-			PR_PostSem(fullBufs);
-			i = (i + 1) % 2;
-		}
-	} while (nbytes > 0);
+    PRUintn i = 0;
+    PRInt32 nbytes;
+
+    do {
+        (void) PR_WaitSem(emptyBufs);
+        nbytes = PR_Read((PRFileDesc*)arg, buf[i].data, BSIZE);
+        if (nbytes >= 0) {
+            buf[i].nbytes = nbytes;
+            PR_PostSem(fullBufs);
+            i = (i + 1) % 2;
+        }
+    } while (nbytes > 0);
 }
 
 static void PR_CALLBACK writer(void *arg)
 {
-	PRUintn	i = 0;
-	PRInt32	nbytes;
-	
-	do {
-		(void) PR_WaitSem(fullBufs);
-		nbytes = buf[i].nbytes;
-		if (nbytes > 0) {
-			nbytes = PR_Write((PRFileDesc*)arg, buf[i].data, nbytes);
-			PR_PostSem(emptyBufs);
-			i = (i + 1) % 2;
-		}
-	} while (nbytes > 0);
+    PRUintn i = 0;
+    PRInt32 nbytes;
+
+    do {
+        (void) PR_WaitSem(fullBufs);
+        nbytes = buf[i].nbytes;
+        if (nbytes > 0) {
+            nbytes = PR_Write((PRFileDesc*)arg, buf[i].data, nbytes);
+            PR_PostSem(emptyBufs);
+            i = (i + 1) % 2;
+        }
+    } while (nbytes > 0);
 }
 
 int main(int argc, char **argv)
 {
-	PRThread *r, *w;
+    PRThread *r, *w;
 
 
-	PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
+    PR_Init(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
     PR_STDIO_INIT();
 
-    emptyBufs = PR_NewSem(2);	/* two empty buffers */
-
-    fullBufs = PR_NewSem(0);	/* zero full buffers */
-
-	/* Create initial temp file setup */
-	InitialSetup();
-	
-	/* create the reader thread */
-	
-	r = PR_CreateThread(PR_USER_THREAD,
-				      reader, t1, 
-				      PR_PRIORITY_NORMAL,
-				      PR_LOCAL_THREAD,
-    				  PR_JOINABLE_THREAD,
-				      0);
-
-	w = PR_CreateThread(PR_USER_THREAD,
-				      writer, t2, 
-				      PR_PRIORITY_NORMAL,
-                      PR_LOCAL_THREAD,
-                      PR_JOINABLE_THREAD,
-                      0);
+    emptyBufs = PR_NewSem(2);   /* two empty buffers */
+
+    fullBufs = PR_NewSem(0);    /* zero full buffers */
+
+    /* Create initial temp file setup */
+    InitialSetup();
+
+    /* create the reader thread */
+
+    r = PR_CreateThread(PR_USER_THREAD,
+                        reader, t1,
+                        PR_PRIORITY_NORMAL,
+                        PR_LOCAL_THREAD,
+                        PR_JOINABLE_THREAD,
+                        0);
+
+    w = PR_CreateThread(PR_USER_THREAD,
+                        writer, t2,
+                        PR_PRIORITY_NORMAL,
+                        PR_LOCAL_THREAD,
+                        PR_JOINABLE_THREAD,
+                        0);
 
     /* Do the joining for both threads */
     (void) PR_JoinThread(r);