From owner-svn-ports-all@freebsd.org  Sat Oct 19 13:34:13 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id A59B2165A3B;
 Sat, 19 Oct 2019 13:34:13 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46wP514gN4z4FvN;
 Sat, 19 Oct 2019 13:34:13 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6B04023297;
 Sat, 19 Oct 2019 13:34:13 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9JDYD9H086330;
 Sat, 19 Oct 2019 13:34:13 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9JDYCDe086325;
 Sat, 19 Oct 2019 13:34:12 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201910191334.x9JDYCDe086325@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sat, 19 Oct 2019 13:34:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r514798 - in branches/2019Q4/devel/nspr: . files
X-SVN-Group: ports-branches
X-SVN-Commit-Author: jbeich
X-SVN-Commit-Paths: in branches/2019Q4/devel/nspr: . files
X-SVN-Commit-Revision: 514798
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Oct 2019 13:34:13 -0000

Author: jbeich
Date: Sat Oct 19 13:34:12 2019
New Revision: 514798
URL: https://svnweb.freebsd.org/changeset/ports/514798

Log:
  MFH: r514733
  
  devel/nspr: update to 4.23
  
  Changes:	http://mozilla.6506.n7.nabble.com/ANNOUNCE-NSPR-4-23-Release-tp382795.html
  ABI:		https://abi-laboratory.pro/tracker/timeline/nspr/
  Approved by:	ports-secteam blanket (required by Firefox 71)

Deleted:
  branches/2019Q4/devel/nspr/files/patch-bug1575821
Modified:
  branches/2019Q4/devel/nspr/Makefile
  branches/2019Q4/devel/nspr/distinfo
  branches/2019Q4/devel/nspr/files/patch-libtests
  branches/2019Q4/devel/nspr/files/patch-tests
  branches/2019Q4/devel/nspr/files/patch-warnings
Directory Properties:
  branches/2019Q4/   (props changed)

Modified: branches/2019Q4/devel/nspr/Makefile
==============================================================================
--- branches/2019Q4/devel/nspr/Makefile	Sat Oct 19 13:11:48 2019	(r514797)
+++ branches/2019Q4/devel/nspr/Makefile	Sat Oct 19 13:34:12 2019	(r514798)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nspr
-DISTVERSION=	4.22
+DISTVERSION=	4.23
 CATEGORIES=	devel
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
 

Modified: branches/2019Q4/devel/nspr/distinfo
==============================================================================
--- branches/2019Q4/devel/nspr/distinfo	Sat Oct 19 13:11:48 2019	(r514797)
+++ branches/2019Q4/devel/nspr/distinfo	Sat Oct 19 13:34:12 2019	(r514798)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566223932
-SHA256 (nspr-4.22.tar.gz) = c9e4b6cc24856ec93202fe13704b38b38ba219f0f2aeac93090ce2b6c696d430
-SIZE (nspr-4.22.tar.gz) = 1078701
+TIMESTAMP = 1571149298
+SHA256 (nspr-4.23.tar.gz) = 4b9d821037faf5723da901515ed9cac8b23ef1ea3729022259777393453477a4
+SIZE (nspr-4.23.tar.gz) = 1078660

Modified: branches/2019Q4/devel/nspr/files/patch-libtests
==============================================================================
--- branches/2019Q4/devel/nspr/files/patch-libtests	Sat Oct 19 13:11:48 2019	(r514797)
+++ branches/2019Q4/devel/nspr/files/patch-libtests	Sat Oct 19 13:34:12 2019	(r514798)
@@ -1,7 +1,7 @@
---- lib/tests/arena.c.orig	2015-10-16 13:22:19 UTC
+--- lib/tests/arena.c.orig	2019-10-15 14:21:38 UTC
 +++ lib/tests/arena.c
 @@ -36,6 +36,7 @@ void DumpAll( void )
- 	return;
+     return;
  }
  
 +#if 0
@@ -16,9 +16,9 @@
  
  
  /*
---- lib/tests/base64t.c.orig	2015-10-16 13:22:19 UTC
+--- lib/tests/base64t.c.orig	2019-10-15 14:21:38 UTC
 +++ lib/tests/base64t.c
-@@ -1987,7 +1987,6 @@ PRBool test_008(void)
+@@ -2362,7 +2362,6 @@ PRBool test_008(void)
      for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
      {
          PRUint32 plen = PL_strlen(array[i].plaintext);
@@ -26,7 +26,7 @@
  
          char *rv = PL_Base64Encode(array[i].plaintext, plen, (char *)0);
  
-@@ -2747,9 +2746,6 @@ PRBool test_024(void)
+@@ -3122,9 +3121,6 @@ PRBool test_024(void)
  
      for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
      {
@@ -36,7 +36,7 @@
          char *rv = PL_Base64Encode(array[i].plaintext, 0, (char *)0);
  
          if( (char *)0 == rv )
-@@ -2883,8 +2879,6 @@ PRBool test_027(void)
+@@ -3258,8 +3254,6 @@ PRBool test_027(void)
  
      for( i = 0; i < sizeof(array)/sizeof(array[0]); i++ )
      {
@@ -45,7 +45,7 @@
          char *rv = PL_Base64Decode(array[i].cyphertext, 0, (char *)0);
  
          if( (char *)0 == rv )
---- lib/tests/string.c.orig	2015-10-16 13:22:19 UTC
+--- lib/tests/string.c.orig	2019-10-15 14:21:38 UTC
 +++ lib/tests/string.c
 @@ -127,7 +127,7 @@ PRBool test_003(void)
          rv = PL_strcpy(array[i].dest, array[i].str);
@@ -56,7 +56,7 @@
                     array[i].str ? array[i].str : "(null)", rv);
              return PR_FALSE;
          }
-@@ -237,8 +237,8 @@ PRBool test_004(void)
+@@ -240,8 +240,8 @@ PRBool test_004(void)
          rv = PL_strncpy(array[i].dest, array[i].str, array[i].len);
          if( array[i].rv != rv )
          {
@@ -67,7 +67,7 @@
              return PR_FALSE;
          }
  
-@@ -363,8 +363,8 @@ PRBool test_005(void)
+@@ -367,8 +367,8 @@ PRBool test_005(void)
          rv = PL_strncpyz(array[i].dest, array[i].str, array[i].len);
          if( array[i].rv != rv )
          {
@@ -78,7 +78,7 @@
              return PR_FALSE;
          }
  
-@@ -415,7 +415,7 @@ PRBool test_006(void)
+@@ -421,7 +421,7 @@ PRBool test_006(void)
  
          if( (char *)0 == rv )
          {
@@ -87,18 +87,18 @@
              return PR_FALSE;
          }
  
-@@ -499,8 +499,8 @@ PRBool test_007(void)
+@@ -507,8 +507,8 @@ PRBool test_007(void)
  
          if( (char *)0 == rv )
          {
--            printf("FAIL %d: %s,%lu -> 0\n", i, 
+-            printf("FAIL %d: %s,%lu -> 0\n", i,
 -                   array[i].str ? array[i].str : "(null)", array[i].len);
-+            printf("FAIL %d: %s,%u -> 0\n", i, 
++            printf("FAIL %d: %s,%u -> 0\n", i,
 +                   array[i].str ? array[i].str : "(null)", (unsigned)array[i].len);
              return PR_FALSE;
          }
  
-@@ -684,10 +684,10 @@ PRBool test_009(void)
+@@ -700,10 +700,10 @@ PRBool test_009(void)
          {
              if( (char *)0 != rv )
              {
@@ -111,7 +111,7 @@
                  return PR_FALSE;
              }
          }
-@@ -695,10 +695,10 @@ PRBool test_009(void)
+@@ -711,10 +711,10 @@ PRBool test_009(void)
          {
              if( (char *)0 == rv )
              {
@@ -124,7 +124,7 @@
                  return PR_FALSE;
              }
              else
-@@ -710,10 +710,10 @@ PRBool test_009(void)
+@@ -726,10 +726,10 @@ PRBool test_009(void)
                  {
                      if( *a != *b )
                      {
@@ -137,7 +137,7 @@
                          return PR_FALSE;
                      }
  
-@@ -725,10 +725,10 @@ PRBool test_009(void)
+@@ -741,10 +741,10 @@ PRBool test_009(void)
                  {
                      if( (char)0 != *b )
                      {
@@ -150,7 +150,7 @@
                          return PR_FALSE;
                      }
                  }
-@@ -736,10 +736,10 @@ PRBool test_009(void)
+@@ -752,10 +752,10 @@ PRBool test_009(void)
                  {
                      if( (char)0 == *b )
                      {
@@ -163,7 +163,7 @@
                          return PR_FALSE;
                      }
                  }
-@@ -814,10 +814,10 @@ PRBool test_010(void)
+@@ -832,10 +832,10 @@ PRBool test_010(void)
          {
              if( (char *)0 != rv )
              {
@@ -176,7 +176,7 @@
                  return PR_FALSE;
              }
          }
-@@ -825,10 +825,10 @@ PRBool test_010(void)
+@@ -843,10 +843,10 @@ PRBool test_010(void)
          {
              if( (char *)0 == rv )
              {
@@ -189,7 +189,7 @@
                  return PR_FALSE;
              }
              else
-@@ -840,10 +840,10 @@ PRBool test_010(void)
+@@ -858,10 +858,10 @@ PRBool test_010(void)
                  {
                      if( *a != *b )
                      {
@@ -202,7 +202,7 @@
                          return PR_FALSE;
                      }
  
-@@ -1072,10 +1072,10 @@ PRBool test_012(void)
+@@ -1104,10 +1104,10 @@ PRBool test_012(void)
                  break;
          }
  
@@ -215,7 +215,7 @@
          return PR_FALSE;
      }
  
-@@ -1294,10 +1294,10 @@ PRBool test_014(void)
+@@ -1338,10 +1338,10 @@ PRBool test_014(void)
                  break;
          }
  
@@ -228,7 +228,7 @@
          return PR_FALSE;
      }
  
-@@ -1367,15 +1367,15 @@ PRBool test_015(void)
+@@ -1411,15 +1411,15 @@ PRBool test_015(void)
          {
              if( (char *)0 == rv )
              {
@@ -248,7 +248,7 @@
                  return PR_FALSE;
              }
          }
-@@ -1447,15 +1447,15 @@ PRBool test_016(void)
+@@ -1491,15 +1491,15 @@ PRBool test_016(void)
          {
              if( (char *)0 == rv )
              {
@@ -268,7 +268,7 @@
                  return PR_FALSE;
              }
          }
-@@ -1522,8 +1522,8 @@ PRBool test_017(void)
+@@ -1566,8 +1566,8 @@ PRBool test_017(void)
          {
              if( (char *)0 != rv )
              {
@@ -279,7 +279,7 @@
                  return PR_FALSE;
              }
          }
-@@ -1531,15 +1531,15 @@ PRBool test_017(void)
+@@ -1575,15 +1575,15 @@ PRBool test_017(void)
          {
              if( (char *)0 == rv )
              {
@@ -299,7 +299,7 @@
                  return PR_FALSE;
              }
          }
-@@ -1606,8 +1606,8 @@ PRBool test_018(void)
+@@ -1650,8 +1650,8 @@ PRBool test_018(void)
          {
              if( (char *)0 != rv )
              {
@@ -310,7 +310,7 @@
                  return PR_FALSE;
              }
          }
-@@ -1615,15 +1615,15 @@ PRBool test_018(void)
+@@ -1659,15 +1659,15 @@ PRBool test_018(void)
          {
              if( (char *)0 == rv )
              {
@@ -331,14 +331,14 @@
                  return PR_FALSE;
              }
          }
-@@ -1702,19 +1702,19 @@ PRBool test_019(void)
+@@ -1746,19 +1746,19 @@ PRBool test_019(void)
          {
              if( (char *)0 == rv )
              {
 -                printf("FAIL %d: %s,%s -> null, not +%lu\n", i,
 +                printf("FAIL %d: %s,%s -> null, not +%u\n", i,
                         array[i].str ? array[i].str : "(null)",
-                        array[i].chrs ? array[i].chrs : "(null)", 
+                        array[i].chrs ? array[i].chrs : "(null)",
 -                       array[i].off);
 +                       (unsigned)array[i].off);
                  return PR_FALSE;
@@ -349,20 +349,20 @@
 -                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
 +                printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i,
                         array[i].str ? array[i].str : "(null)",
-                        array[i].chrs ? array[i].chrs : "(null)", 
+                        array[i].chrs ? array[i].chrs : "(null)",
 -                       rv, array[i].str, array[i].off);
 +                       rv, array[i].str, (unsigned)array[i].off);
                  return PR_FALSE;
              }
          }
-@@ -1793,19 +1793,19 @@ PRBool test_020(void)
+@@ -1837,19 +1837,19 @@ PRBool test_020(void)
          {
              if( (char *)0 == rv )
              {
 -                printf("FAIL %d: %s,%s -> null, not +%lu\n", i,
 +                printf("FAIL %d: %s,%s -> null, not +%u\n", i,
                         array[i].str ? array[i].str : "(null)",
-                        array[i].chrs ? array[i].chrs : "(null)", 
+                        array[i].chrs ? array[i].chrs : "(null)",
 -                       array[i].off);
 +                       (unsigned)array[i].off);
                  return PR_FALSE;
@@ -373,33 +373,33 @@
 -                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
 +                printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i,
                         array[i].str ? array[i].str : "(null)",
-                        array[i].chrs ? array[i].chrs : "(null)", 
+                        array[i].chrs ? array[i].chrs : "(null)",
 -                       rv, array[i].str, array[i].off);
 +                       rv, array[i].str, (unsigned)array[i].off);
                  return PR_FALSE;
              }
          }
-@@ -1879,10 +1879,10 @@ PRBool test_021(void)
+@@ -1923,10 +1923,10 @@ PRBool test_021(void)
          {
              if( (char *)0 != rv )
              {
--                printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i, 
-+                printf("FAIL %d: %s,%s/%u -> %.32s, not null\n", i, 
+-                printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
++                printf("FAIL %d: %s,%s/%u -> %.32s, not null\n", i,
                         array[i].str ? array[i].str : "(null)",
-                        array[i].chrs ? array[i].chrs : "(null)", 
+                        array[i].chrs ? array[i].chrs : "(null)",
 -                       array[i].max, rv);
 +                       (unsigned)array[i].max, rv);
                  return PR_FALSE;
              }
          }
-@@ -1890,19 +1890,19 @@ PRBool test_021(void)
+@@ -1934,19 +1934,19 @@ PRBool test_021(void)
          {
              if( (char *)0 == rv )
              {
 -                printf("FAIL %d: %s,%s/%lu -> null, not +%lu\n", i,
 +                printf("FAIL %d: %s,%s/%u -> null, not +%u\n", i,
                         array[i].str ? array[i].str : "(null)",
-                        array[i].chrs ? array[i].chrs : "(null)", 
+                        array[i].chrs ? array[i].chrs : "(null)",
 -                       array[i].max, array[i].off);
 +                       (unsigned)array[i].max, array[i].off);
                  return PR_FALSE;
@@ -410,33 +410,33 @@
 -                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
 +                printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i,
                         array[i].str ? array[i].str : "(null)",
-                        array[i].chrs ? array[i].chrs : "(null)", 
+                        array[i].chrs ? array[i].chrs : "(null)",
 -                       array[i].max, rv, array[i].str, array[i].off);
 +                       (unsigned)array[i].max, rv, array[i].str, array[i].off);
                  return PR_FALSE;
              }
          }
-@@ -1985,10 +1985,10 @@ PRBool test_022(void)
+@@ -2029,10 +2029,10 @@ PRBool test_022(void)
          {
              if( (char *)0 != rv )
              {
--                printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i, 
-+                printf("FAIL %d: %s,%s/%u -> %.32s, not null\n", i, 
+-                printf("FAIL %d: %s,%s/%lu -> %.32s, not null\n", i,
++                printf("FAIL %d: %s,%s/%u -> %.32s, not null\n", i,
                         array[i].str ? array[i].str : "(null)",
-                        array[i].chrs ? array[i].chrs : "(null)", 
+                        array[i].chrs ? array[i].chrs : "(null)",
 -                       array[i].max, rv);
 +                       (unsigned)array[i].max, rv);
                  return PR_FALSE;
              }
          }
-@@ -1996,19 +1996,19 @@ PRBool test_022(void)
+@@ -2040,19 +2040,19 @@ PRBool test_022(void)
          {
              if( (char *)0 == rv )
              {
 -                printf("FAIL %d: %s,%s/%lu -> null, not +%lu\n", i,
 +                printf("FAIL %d: %s,%s/%u -> null, not +%u\n", i,
                         array[i].str ? array[i].str : "(null)",
-                        array[i].chrs ? array[i].chrs : "(null)", 
+                        array[i].chrs ? array[i].chrs : "(null)",
 -                       array[i].max, array[i].off);
 +                       (unsigned)array[i].max, array[i].off);
                  return PR_FALSE;
@@ -447,13 +447,13 @@
 -                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
 +                printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i,
                         array[i].str ? array[i].str : "(null)",
-                        array[i].chrs ? array[i].chrs : "(null)", 
+                        array[i].chrs ? array[i].chrs : "(null)",
 -                       array[i].max, rv, array[i].str, array[i].off);
 +                       (unsigned)array[i].max, rv, array[i].str, array[i].off);
                  return PR_FALSE;
              }
          }
-@@ -2104,19 +2104,19 @@ PRBool test_023(void)
+@@ -2148,19 +2148,19 @@ PRBool test_023(void)
          {
              if( (char *)0 == rv )
              {
@@ -468,8 +468,8 @@
  
              if( &array[i].str[ array[i].off ] != rv )
              {
--                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i, 
-+                printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i, 
+-                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
++                printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i,
                         array[i].str ? array[i].str : "(null)",
                         array[i].sub ? array[i].sub : "(null)",
 -                       rv, array[i].str, array[i].off);
@@ -477,7 +477,7 @@
                  return PR_FALSE;
              }
          }
-@@ -2212,19 +2212,19 @@ PRBool test_024(void)
+@@ -2256,19 +2256,19 @@ PRBool test_024(void)
          {
              if( (char *)0 == rv )
              {
@@ -492,8 +492,8 @@
  
              if( &array[i].str[ array[i].off ] != rv )
              {
--                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i, 
-+                printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i, 
+-                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
++                printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i,
                         array[i].str ? array[i].str : "(null)",
                         array[i].sub ? array[i].sub : "(null)",
 -                       rv, array[i].str, array[i].off);
@@ -501,7 +501,7 @@
                  return PR_FALSE;
              }
          }
-@@ -2331,10 +2331,10 @@ PRBool test_025(void)
+@@ -2375,10 +2375,10 @@ PRBool test_025(void)
          {
              if( (char *)0 != rv )
              {
@@ -514,7 +514,7 @@
                  return PR_FALSE;
              }
          }
-@@ -2342,19 +2342,19 @@ PRBool test_025(void)
+@@ -2386,19 +2386,19 @@ PRBool test_025(void)
          {
              if( (char *)0 == rv )
              {
@@ -529,8 +529,8 @@
  
              if( &array[i].str[ array[i].off ] != rv )
              {
--                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i, 
-+                printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i, 
+-                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
++                printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i,
                         array[i].str ? array[i].str : "(null)",
                         array[i].sub ? array[i].sub : "(null)",
 -                       array[i].max, rv, array[i].str, array[i].off);
@@ -538,7 +538,7 @@
                  return PR_FALSE;
              }
          }
-@@ -2463,10 +2463,10 @@ PRBool test_026(void)
+@@ -2507,10 +2507,10 @@ PRBool test_026(void)
          {
              if( (char *)0 != rv )
              {
@@ -551,7 +551,7 @@
                  return PR_FALSE;
              }
          }
-@@ -2474,19 +2474,19 @@ PRBool test_026(void)
+@@ -2518,19 +2518,19 @@ PRBool test_026(void)
          {
              if( (char *)0 == rv )
              {
@@ -566,8 +566,8 @@
  
              if( &array[i].str[ array[i].off ] != rv )
              {
--                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i, 
-+                printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i, 
+-                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
++                printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i,
                         array[i].str ? array[i].str : "(null)",
                         array[i].sub ? array[i].sub : "(null)",
 -                       array[i].max, rv, array[i].str, array[i].off);
@@ -575,7 +575,7 @@
                  return PR_FALSE;
              }
          }
-@@ -2582,19 +2582,19 @@ PRBool test_027(void)
+@@ -2626,19 +2626,19 @@ PRBool test_027(void)
          {
              if( (char *)0 == rv )
              {
@@ -590,8 +590,8 @@
  
              if( &array[i].str[ array[i].off ] != rv )
              {
--                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i, 
-+                printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i, 
+-                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
++                printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i,
                         array[i].str ? array[i].str : "(null)",
                         array[i].sub ? array[i].sub : "(null)",
 -                       rv, array[i].str, array[i].off);
@@ -599,7 +599,7 @@
                  return PR_FALSE;
              }
          }
-@@ -2690,19 +2690,19 @@ PRBool test_028(void)
+@@ -2734,19 +2734,19 @@ PRBool test_028(void)
          {
              if( (char *)0 == rv )
              {
@@ -614,8 +614,8 @@
  
              if( &array[i].str[ array[i].off ] != rv )
              {
--                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i, 
-+                printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i, 
+-                printf("FAIL %d: %s,%s -> 0x%x, not 0x%x+%lu\n", i,
++                printf("FAIL %d: %s,%s -> %p, not %p+%u\n", i,
                         array[i].str ? array[i].str : "(null)",
                         array[i].sub ? array[i].sub : "(null)",
 -                       rv, array[i].str, array[i].off);
@@ -623,7 +623,7 @@
                  return PR_FALSE;
              }
          }
-@@ -2809,10 +2809,10 @@ PRBool test_029(void)
+@@ -2853,10 +2853,10 @@ PRBool test_029(void)
          {
              if( (char *)0 != rv )
              {
@@ -636,7 +636,7 @@
                  return PR_FALSE;
              }
          }
-@@ -2820,19 +2820,19 @@ PRBool test_029(void)
+@@ -2864,19 +2864,19 @@ PRBool test_029(void)
          {
              if( (char *)0 == rv )
              {
@@ -651,8 +651,8 @@
  
              if( &array[i].str[ array[i].off ] != rv )
              {
--                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i, 
-+                printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i, 
+-                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
++                printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i,
                         array[i].str ? array[i].str : "(null)",
                         array[i].sub ? array[i].sub : "(null)",
 -                       array[i].max, rv, array[i].str, array[i].off);
@@ -660,7 +660,7 @@
                  return PR_FALSE;
              }
          }
-@@ -2941,10 +2941,10 @@ PRBool test_030(void)
+@@ -2985,10 +2985,10 @@ PRBool test_030(void)
          {
              if( (char *)0 != rv )
              {
@@ -673,7 +673,7 @@
                  return PR_FALSE;
              }
          }
-@@ -2952,19 +2952,19 @@ PRBool test_030(void)
+@@ -2996,19 +2996,19 @@ PRBool test_030(void)
          {
              if( (char *)0 == rv )
              {
@@ -688,8 +688,8 @@
  
              if( &array[i].str[ array[i].off ] != rv )
              {
--                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i, 
-+                printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i, 
+-                printf("FAIL %d: %s,%s/%lu -> 0x%x, not 0x%x+%lu\n", i,
++                printf("FAIL %d: %s,%s/%u -> %p, not %p+%u\n", i,
                         array[i].str ? array[i].str : "(null)",
                         array[i].sub ? array[i].sub : "(null)",
 -                       array[i].max, rv, array[i].str, array[i].off);

Modified: branches/2019Q4/devel/nspr/files/patch-tests
==============================================================================
--- branches/2019Q4/devel/nspr/files/patch-tests	Sat Oct 19 13:11:48 2019	(r514797)
+++ branches/2019Q4/devel/nspr/files/patch-tests	Sat Oct 19 13:34:12 2019	(r514798)
@@ -1,4 +1,4 @@
---- lib/tests/Makefile.in.orig	2019-08-19 14:12:12 UTC
+--- lib/tests/Makefile.in.orig	2019-10-15 14:21:38 UTC
 +++ lib/tests/Makefile.in
 @@ -159,7 +159,7 @@ else
  ifeq ($(OS_ARCH),OS2)
@@ -9,7 +9,7 @@
  endif
  endif
  endif
---- pr/tests/Makefile.in.orig	2019-08-19 14:12:12 UTC
+--- pr/tests/Makefile.in.orig	2019-10-15 14:21:38 UTC
 +++ pr/tests/Makefile.in
 @@ -442,17 +442,18 @@ endif
  ALWAYS:
@@ -41,7 +41,7 @@
  	done
 -	@$(ECHO) "\nEND\t\t`date`\n"
 +	@$(ECHO) "END		`date`"
---- pr/tests/cleanup.c.orig	2019-08-19 14:12:12 UTC
+--- pr/tests/cleanup.c.orig	2019-10-15 14:21:38 UTC
 +++ pr/tests/cleanup.c
 @@ -15,7 +15,7 @@
  
@@ -53,7 +53,7 @@
  }
  
 @@ -39,7 +39,8 @@ int main(int argc, char **argv)
- 	PRThreadScope type = PR_LOCAL_THREAD;
+     PRThreadScope type = PR_LOCAL_THREAD;
      PRFileDesc *err = PR_GetSpecialFD(PR_StandardError);
      PLOptState *opt = PL_CreateOptState(argc, argv, "Ghs:S:t:cC:");
 -    PRIntn concurrency = 1, child_sleep = 10, main_sleep = 5, threads = 1;
@@ -62,18 +62,18 @@
  
      PR_STDIO_INIT();
      while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
-@@ -80,7 +81,7 @@ int main(int argc, char **argv)
-         (PR_LOCAL_THREAD == type) ? "LOCAL" : "GLOBAL");
+@@ -82,7 +83,7 @@ int main(int argc, char **argv)
+                (PR_LOCAL_THREAD == type) ? "LOCAL" : "GLOBAL");
      PR_fprintf(err, "\tConcurrency: %d\n", concurrency);
      PR_fprintf(err, "\tNumber of threads: %d\n", threads);
 -    PR_fprintf(err, "\tThread sleep: %d\n", child_sleep);
 +    PR_fprintf(err, "\tThread sleep: %d\n", (int)child_sleep);
-     PR_fprintf(err, "\tMain sleep: %d\n", main_sleep); 
-     PR_fprintf(err, "\tCleanup will %sbe called\n\n", (cleanup) ? "" : "NOT "); 
+     PR_fprintf(err, "\tMain sleep: %d\n", main_sleep);
+     PR_fprintf(err, "\tCleanup will %sbe called\n\n", (cleanup) ? "" : "NOT ");
  
---- pr/tests/cltsrv.c.orig	2019-08-19 14:12:12 UTC
+--- pr/tests/cltsrv.c.orig	2019-10-15 14:21:38 UTC
 +++ pr/tests/cltsrv.c
-@@ -887,7 +887,7 @@ int main(int argc, char** argv)
+@@ -931,7 +931,7 @@ int main(int argc, char** argv)
  {
      PRUintn index;
      PRBool boolean;
@@ -82,59 +82,60 @@
      PRStatus rv, joinStatus;
      CSServer_t *server = NULL;
  
---- pr/tests/cvar.c.orig	2019-08-19 14:12:12 UTC
+--- pr/tests/cvar.c.orig	2019-10-15 14:21:38 UTC
 +++ pr/tests/cvar.c
-@@ -135,14 +135,14 @@ static int alive;
+@@ -138,15 +138,15 @@ static int alive;
  static void PR_CALLBACK CXReader(void *arg)
  {
- 	CircBuf *cbp = (CircBuf *)arg;
+     CircBuf *cbp = (CircBuf *)arg;
 -    PRInt32 i, n;
 +    intptr_t i, n;
      void *data;
  
      n = count / 2;
      for (i = 0; i < n; i++) {
- 		data = GetCBData(cbp);
--		if ((int)data != i)
--    		if (debug_mode) printf("data mismatch at for i = %d usec\n", i);
-+		if ((intptr_t)data != i)
-+    		if (debug_mode) printf("data mismatch at for i = %ld usec\n", (long)i);
+         data = GetCBData(cbp);
+-        if ((int)data != i)
++        if ((intptr_t)data != i)
+             if (debug_mode) {
+-                printf("data mismatch at for i = %d usec\n", i);
++                printf("data mismatch at for i = %ld usec\n", (long)i);
+             }
      }
-  
-     PR_EnterMonitor(mon);
-@@ -154,7 +154,7 @@ static void PR_CALLBACK CXReader(void *arg)
+ 
+@@ -159,7 +159,7 @@ static void PR_CALLBACK CXReader(void *arg)
  static void PR_CALLBACK CXWriter(void *arg)
  {
- 	CircBuf *cbp = (CircBuf *)arg;
+     CircBuf *cbp = (CircBuf *)arg;
 -    PRInt32 i, n;
 +    intptr_t i, n;
  
      n = count / 2;
-     for (i = 0; i < n; i++)
---- pr/tests/cvar2.c.orig	2019-08-19 14:12:12 UTC
+     for (i = 0; i < n; i++) {
+--- pr/tests/cvar2.c.orig	2019-10-15 14:21:38 UTC
 +++ pr/tests/cvar2.c
-@@ -95,7 +95,7 @@ PrivateCondVarThread(void *_info)
+@@ -96,7 +96,7 @@ PrivateCondVarThread(void *_info)
      for (index=0; index<info->loops; index++) {
          PR_Lock(info->lock);
          if (*info->tcount == 0) {
--	    DPRINTF(("PrivateCondVarThread: thread 0x%lx waiting on cvar = 0x%lx\n",
-+	    DPRINTF(("PrivateCondVarThread: thread %p waiting on cvar = %p\n",
- 				PR_GetCurrentThread(), info->cvar));
+-            DPRINTF(("PrivateCondVarThread: thread 0x%lx waiting on cvar = 0x%lx\n",
++            DPRINTF(("PrivateCondVarThread: thread %p waiting on cvar = %p\n",
+                      PR_GetCurrentThread(), info->cvar));
              PR_WaitCondVar(info->cvar, info->timeout);
- 	}
-@@ -108,8 +108,8 @@ PrivateCondVarThread(void *_info)
+         }
+@@ -109,8 +109,8 @@ PrivateCondVarThread(void *_info)
          PR_Lock(info->exitlock);
          (*info->exitcount)++;
          PR_NotifyCondVar(info->exitcvar);
--DPRINTF(("PrivateCondVarThread: thread 0x%lx notified exitcvar = 0x%lx cnt = %ld\n",
--			PR_GetCurrentThread(), info->exitcvar,(*info->exitcount)));
-+DPRINTF(("PrivateCondVarThread: thread %p notified exitcvar = %p cnt = %d\n",
-+			PR_GetCurrentThread(), info->exitcvar,(int)(*info->exitcount)));
+-        DPRINTF(("PrivateCondVarThread: thread 0x%lx notified exitcvar = 0x%lx cnt = %ld\n",
+-                 PR_GetCurrentThread(), info->exitcvar,(*info->exitcount)));
++        DPRINTF(("PrivateCondVarThread: thread %p notified exitcvar = %p cnt = %d\n",
++                 PR_GetCurrentThread(), info->exitcvar,(int)(*info->exitcount)));
          PR_Unlock(info->exitlock);
      }
  #if 0
-@@ -157,7 +157,7 @@ CreateTestThread(threadinfo *info, 
- void 
+@@ -159,7 +159,7 @@ CreateTestThread(threadinfo *info,
+ void
  CondVarTestSUU(void *_arg)
  {
 -    PRInt32 arg = (PRInt32)_arg;
@@ -142,26 +143,26 @@
      PRInt32 index, loops;
      threadinfo *list;
      PRLock *sharedlock;
-@@ -189,7 +189,7 @@ CondVarTestSUU(void *_arg)
+@@ -191,7 +191,7 @@ CondVarTestSUU(void *_arg)
                           PR_TRUE,
                           PR_LOCAL_THREAD);
          index++;
--	DPRINTF(("CondVarTestSUU: created thread 0x%lx\n",list[index].thread));
-+	DPRINTF(("CondVarTestSUU: created thread %p\n",list[index].thread));
+-        DPRINTF(("CondVarTestSUU: created thread 0x%lx\n",list[index].thread));
++        DPRINTF(("CondVarTestSUU: created thread %p\n",list[index].thread));
      }
  
      for (loops = 0; loops < count; loops++) {
-@@ -199,7 +199,7 @@ CondVarTestSUU(void *_arg)
+@@ -201,7 +201,7 @@ CondVarTestSUU(void *_arg)
              (*list[index].tcount)++;
              PR_NotifyCondVar(list[index].cvar);
              PR_Unlock(list[index].lock);
--	    DPRINTF(("PrivateCondVarThread: thread 0x%lx notified cvar = 0x%lx\n",
-+	    DPRINTF(("PrivateCondVarThread: thread %p notified cvar = %p\n",
- 				PR_GetCurrentThread(), list[index].cvar));
+-            DPRINTF(("PrivateCondVarThread: thread 0x%lx notified cvar = 0x%lx\n",
++            DPRINTF(("PrivateCondVarThread: thread %p notified cvar = %p\n",
+                      PR_GetCurrentThread(), list[index].cvar));
          }
  
-@@ -227,7 +227,7 @@ CondVarTestSUU(void *_arg)
- void 
+@@ -231,7 +231,7 @@ CondVarTestSUU(void *_arg)
+ void
  CondVarTestSUK(void *_arg)
  {
 -    PRInt32 arg = (PRInt32)_arg;
@@ -169,8 +170,8 @@
      PRInt32 index, loops;
      threadinfo *list;
      PRLock *sharedlock;
-@@ -301,7 +301,7 @@ CondVarTestSUK(void *_arg)
- void 
+@@ -307,7 +307,7 @@ CondVarTestSUK(void *_arg)
+ void
  CondVarTestPUU(void *_arg)
  {
 -    PRInt32 arg = (PRInt32)_arg;
@@ -178,37 +179,37 @@
      PRInt32 index, loops;
      threadinfo *list;
      PRLock *sharedlock;
-@@ -336,7 +336,7 @@ CondVarTestPUU(void *_arg)
+@@ -342,7 +342,7 @@ CondVarTestPUU(void *_arg)
                           PR_FALSE,
                           PR_LOCAL_THREAD);
  
--	DPRINTF(("CondVarTestPUU: created thread 0x%lx\n",list[index].thread));
-+	DPRINTF(("CondVarTestPUU: created thread %p\n",list[index].thread));
+-        DPRINTF(("CondVarTestPUU: created thread 0x%lx\n",list[index].thread));
++        DPRINTF(("CondVarTestPUU: created thread %p\n",list[index].thread));
          index++;
- 	tcount++;
+         tcount++;
      }
-@@ -354,8 +354,8 @@ CondVarTestPUU(void *_arg)
- 	PR_Lock(exitlock);
+@@ -360,8 +360,8 @@ CondVarTestPUU(void *_arg)
+         PR_Lock(exitlock);
          /* Wait for threads to finish */
          while(exitcount < arg) {
--DPRINTF(("CondVarTestPUU: thread 0x%lx waiting on exitcvar = 0x%lx cnt = %ld\n",
--				PR_GetCurrentThread(), exitcvar, exitcount));
-+DPRINTF(("CondVarTestPUU: thread %p waiting on exitcvar = %p cnt = %d\n",
-+				PR_GetCurrentThread(), exitcvar, (int)exitcount));
-             	PR_WaitCondVar(exitcvar, PR_SecondsToInterval(60));
- 	}
+-            DPRINTF(("CondVarTestPUU: thread 0x%lx waiting on exitcvar = 0x%lx cnt = %ld\n",
+-                     PR_GetCurrentThread(), exitcvar, exitcount));
++            DPRINTF(("CondVarTestPUU: thread %p waiting on exitcvar = %p cnt = %d\n",
++                     PR_GetCurrentThread(), exitcvar, (int)exitcount));
+             PR_WaitCondVar(exitcvar, PR_SecondsToInterval(60));
+         }
          PR_ASSERT(exitcount >= arg);
-@@ -365,7 +365,7 @@ DPRINTF(("CondVarTestPUU: thread 0x%lx waiting on exit
+@@ -371,7 +371,7 @@ CondVarTestPUU(void *_arg)
  
      /* Join all the threads */
      for(index=0; index<(arg); index++)  {
--	DPRINTF(("CondVarTestPUU: joining thread 0x%lx\n",list[index].thread));
-+	DPRINTF(("CondVarTestPUU: joining thread %p\n",list[index].thread));
+-        DPRINTF(("CondVarTestPUU: joining thread 0x%lx\n",list[index].thread));
++        DPRINTF(("CondVarTestPUU: joining thread %p\n",list[index].thread));
          PR_JoinThread(list[index].thread);
          if (list[index].internal) {
              PR_Lock(list[index].lock);
-@@ -387,7 +387,7 @@ DPRINTF(("CondVarTestPUU: thread 0x%lx waiting on exit
- void 
+@@ -393,7 +393,7 @@ CondVarTestPUU(void *_arg)
+ void
  CondVarTestPUK(void *_arg)
  {
 -    PRInt32 arg = (PRInt32)_arg;
@@ -216,8 +217,8 @@
      PRInt32 index, loops;
      threadinfo *list;
      PRLock *sharedlock;
-@@ -468,7 +468,7 @@ CondVarTestPUK(void *_arg)
- void 
+@@ -475,7 +475,7 @@ CondVarTestPUK(void *_arg)
+ void
  CondVarTest(void *_arg)
  {
 -    PRInt32 arg = (PRInt32)_arg;
@@ -225,8 +226,8 @@
      PRInt32 index, loops;
      threadinfo *list;
      PRLock *sharedlock;
-@@ -601,7 +601,7 @@ CondVarTest(void *_arg)
- void 
+@@ -609,7 +609,7 @@ CondVarTest(void *_arg)
+ void
  CondVarTimeoutTest(void *_arg)
  {
 -    PRInt32 arg = (PRInt32)_arg;
@@ -234,8 +235,8 @@
      PRInt32 index, loops;
      threadinfo *list;
      PRLock *sharedlock;
-@@ -712,7 +712,7 @@ CondVarTimeoutTest(void *_arg)
- void 
+@@ -721,7 +721,7 @@ CondVarTimeoutTest(void *_arg)
+ void
  CondVarMixedTest(void *_arg)
  {
 -    PRInt32 arg = (PRInt32)_arg;
@@ -243,7 +244,7 @@
      PRInt32 index, loops;
      threadinfo *list;
      PRLock *sharedlock;
-@@ -802,7 +802,7 @@ CondVarMixedTest(void *_arg)
+@@ -811,7 +811,7 @@ CondVarMixedTest(void *_arg)
          for(index=0; index<(arg*4); index+=3) {
  
              PR_Lock(list[index].lock);
@@ -252,7 +253,7 @@
              PR_NotifyCondVar(list[index].cvar);
              PR_Unlock(list[index].lock);
  
-@@ -873,7 +873,7 @@ static void Measure(void (*func)(void *), PRInt32 arg,
+@@ -883,7 +883,7 @@ static void Measure(void (*func)(void *), PRInt32 arg,
      double d;
  
      start = PR_IntervalNow();
@@ -261,7 +262,7 @@
      stop = PR_IntervalNow();
  
      d = (double)PR_IntervalToMicroseconds(stop - start);
-@@ -932,7 +932,7 @@ default_threads, default_threads*2, default_threads*3,
+@@ -948,7 +948,7 @@ This test is run with %d, %d, %d, and %d threads of ea
      PR_SetConcurrency(2);
  
      for (threads = default_threads; threads < default_threads*5; threads+=default_threads) {
@@ -270,7 +271,7 @@
          Measure(CondVarTestSUU, threads, "Condvar simple test shared UU");
          Measure(CondVarTestSUK, threads, "Condvar simple test shared UK");
          Measure(CondVarTestPUU, threads, "Condvar simple test priv UU");
---- pr/tests/foreign.c.orig	2019-08-19 14:12:12 UTC
+--- pr/tests/foreign.c.orig	2019-10-15 14:21:38 UTC
 +++ pr/tests/foreign.c
 @@ -175,7 +175,7 @@ static void OneShot(void *arg)
      PRFileDesc *fd;
@@ -279,18 +280,18 @@
 -    PRIntn test = (PRIntn)arg;
 +    intptr_t test = (intptr_t)arg;
  
- 	for (test = 0; test < 12; ++test) {
+     for (test = 0; test < 12; ++test) {
  
 @@ -271,7 +271,7 @@ static void OneShot(void *arg)
  int main(int argc, char **argv)
  {
      PRStatus rv;
--	PRInt32	thread_cnt = DEFAULT_THREAD_COUNT;
-+	intptr_t	thread_cnt = DEFAULT_THREAD_COUNT;
- 	PLOptStatus os;
- 	PLOptState *opt = PL_CreateOptState(argc, argv, "dt:");
+-    PRInt32 thread_cnt = DEFAULT_THREAD_COUNT;
++    intptr_t    thread_cnt = DEFAULT_THREAD_COUNT;
+     PLOptStatus os;
+     PLOptState *opt = PL_CreateOptState(argc, argv, "dt:");
  
---- pr/tests/forktest.c.orig	2019-08-19 14:12:12 UTC
+--- pr/tests/forktest.c.orig	2019-10-15 14:21:38 UTC
 +++ pr/tests/forktest.c
 @@ -47,7 +47,7 @@ ClientThreadFunc(void *arg)
  {
@@ -305,9 +306,9 @@
          goto finish;
      }
      clientThread = PR_CreateThread( PR_USER_THREAD, ClientThreadFunc,
--        (void *) PR_ntohs(addr.inet.port), PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-+        (void *)(intptr_t)PR_ntohs(addr.inet.port), PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
-         PR_JOINABLE_THREAD, 0);
+-                                    (void *) PR_ntohs(addr.inet.port), PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
++                                    (void *)(intptr_t)PR_ntohs(addr.inet.port), PR_PRIORITY_NORMAL, PR_LOCAL_THREAD,
+                                     PR_JOINABLE_THREAD, 0);
      if (clientThread == NULL) {
          fprintf(stderr, "Cannot create client thread: (%d, %d)\n",
 @@ -151,6 +151,9 @@ DoIO(void)
@@ -320,24 +321,26 @@
      printf("Accepting connection at port %hu\n", PR_ntohs(addr.inet.port));
      fflush(stdout);
      sock = PR_Accept(listenSock, &addr, PR_SecondsToInterval(5));
---- pr/tests/getai.c.orig	2019-08-19 14:12:12 UTC
+--- pr/tests/getai.c.orig	2019-10-15 14:21:38 UTC
 +++ pr/tests/getai.c
-@@ -13,8 +13,13 @@ int main(int argc, char **argv)
+@@ -13,8 +13,15 @@ int main(int argc, char **argv)
      PRAddrInfo *ai;
      void *iter;
      PRNetAddr addr;
 +    const char *host;
  
 -    ai = PR_GetAddrInfoByName(argv[1], PR_AF_UNSPEC, PR_AI_ADDRCONFIG);
-+    if (argc > 1)
-+	host = argv[1];
-+    else
-+	host = "www.FreeBSD.org";
++    if (argc > 1) {
++        host = argv[1];
++    }
++    else {
++        host = "www.FreeBSD.org";
++    }
 +    ai = PR_GetAddrInfoByName(host, PR_AF_UNSPEC, PR_AI_ADDRCONFIG);
      if (ai == NULL) {
          fprintf(stderr, "PR_GetAddrInfoByName failed: (%d, %d)\n",
-             PR_GetError(), PR_GetOSError());
---- pr/tests/instrumt.c.orig	2019-08-19 14:12:12 UTC
+                 PR_GetError(), PR_GetOSError());
+--- pr/tests/instrumt.c.orig	2019-10-15 14:21:38 UTC
 +++ pr/tests/instrumt.c
 @@ -36,6 +36,7 @@
  */
@@ -352,7 +355,7 @@
  
  #define SMALL_TRACE_BUFSIZE  ( 60 * 1024 )
 -
- typedef enum 
+ typedef enum
  {
      CountLoop = 1,
 @@ -78,10 +78,10 @@ static void Help(void)
@@ -375,12 +378,12 @@
 +            PR_GET_COUNTER_NAME_FROM_HANDLE( rh, &qn, &rn, &dn );
              PR_GET_COUNTER(tCtr, rh);
              PR_LOG( lm, msgLevel,
-                 ( "QName: %s  RName: %s  Desc: %s  Value: %ld\n", 
+                     ( "QName: %s  RName: %s  Desc: %s  Value: %ld\n",
 @@ -101,15 +101,15 @@ static void ListCounters(void)
-         } 
+         }
          PR_FIND_NEXT_COUNTER_QNAME(qh, qh);
      }
--    return;    
+-    return;
 +#endif
  } /* end ListCounters() */
  
@@ -401,13 +404,13 @@
 -            PR_GET_TRACE_NAME_FROM_HANDLE( rh, qname, rname, desc );

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***